move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration

[ardour.git] / gtk2_ardour / time_axis_view_item.cc

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 2f860d897bfa10e29c760f637c9008ba50ad5d37..e6053906e05d68afc3f4b039259099823154d53f 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -95,7 +95,7 @@ TimeAxisViewItem::set_constant_heights ()
                Y_OFFSET is measured from the top of the time axis view item.
        */
 
-       if (Config->get_show_name_highlight()) {
+       if (ARDOUR_UI::config()->get_show_name_highlight()) {
                NAME_Y_OFFSET = height + 1;
                NAME_HIGHLIGHT_SIZE = height + 2;
        } else {
@@ -169,7 +169,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
 
        fill_color = base_color;
-       _fill_color_name = "region base";
+       fill_color_name = "time axis view item base";
        samples_per_pixel = fpp;
        frame_position = start;
        item_duration = duration;
@@ -184,7 +184,6 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        last_item_width = 0;
        wide_enough_for_name = wide;
        high_enough_for_name = high;
-        rect_visible = true;
        vestigial_frame = 0;
 
        if (duration == 0) {
@@ -208,7 +207,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                }
        }
        
-       if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
+       if (ARDOUR_UI::config()->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
 
                double width;
                double start = 1.0;
@@ -236,7 +235,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        if (visibility & ShowNameText) {
                name_text = new ArdourCanvas::Text (group);
                CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
-               if (Config->get_show_name_highlight()) {
+               if (ARDOUR_UI::config()->get_show_name_highlight()) {
                        name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
                } else {
                        name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
@@ -287,30 +286,6 @@ TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
        return false;
 }
 
-void
-TimeAxisViewItem::hide_rect ()
-{
-        rect_visible = false;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->set_outline_what (ArdourCanvas::Rectangle::What (0));
-                name_highlight->set_fill_color (UINT_RGBA_CHANGE_A (fill_color, 64));
-        }
-}
-
-void
-TimeAxisViewItem::show_rect ()
-{
-        rect_visible = true;
-        set_frame_color ();
-
-        if (name_highlight) {
-                name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
-                name_highlight->set_fill_color (fill_color);
-        }
-}
-
 /**
  * Set the position of this item on the timeline.
  *
@@ -589,7 +564,7 @@ TimeAxisViewItem::set_height (double height)
        manage_name_highlight ();
 
        if (visibility & ShowNameText) {
-               if (Config->get_show_name_highlight()) {
+               if (ARDOUR_UI::config()->get_show_name_highlight()) {
                        name_text->set_y_position (height - NAME_Y_OFFSET); 
                } else {
                        name_text->set_y_position (NAME_Y_OFFSET); 
@@ -701,7 +676,7 @@ TimeAxisViewItem::set_name_text_color ()
 
        uint32_t f;
        
-       if (Config->get_show_name_highlight()) {
+       if (ARDOUR_UI::config()->get_show_name_highlight()) {
                /* name text will always be on top of name highlight, which
                   will always use our fill color.
                */
@@ -716,56 +691,30 @@ TimeAxisViewItem::set_name_text_color ()
        name_text->set_color (ArdourCanvas::contrasting_text_color (f));
 }
 
-uint32_t
-TimeAxisViewItem::fill_opacity () const
-{
-       if (!rect_visible) {
-               /* if the frame/rect is marked as "invisible", then the
-                  fill should be translucent.parent.
-               */
-               return 64;
-       }
-
-       if (_dragging) {
-               return 130;
-       }
-
-       uint32_t col = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name);
-       return UINT_RGBA_A (col);
-}
-
-uint32_t
+ArdourCanvas::Color
 TimeAxisViewItem::get_fill_color () const
 {
-       uint32_t f;
-       uint32_t o = fill_opacity ();
+       ArdourCanvas::Color c;
+       const std::string mod_name = (_dragging ? "dragging region" : fill_color_name);
 
        if (_selected) {
 
-               f = ARDOUR_UI::config()->color ("selected region base");
+               c = ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
 
-               if (o == 0) {
-                       /* some condition of this item has set fill opacity to
-                        * zero, but it has been selected, so use a mid-way
-                        * alpha value to make it reasonably visible.
-                        */
-                       o = 130;
-               }
-               
        } else {
 
                if (_recregion) {
-                       f = ARDOUR_UI::config()->color ("recording rect");
+                       c = ARDOUR_UI::config()->color ("recording rect");
                } else {
-                       if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-                               f = ARDOUR_UI::config()->color_mod (_fill_color_name, _fill_color_name);
+                       if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+                               c = ARDOUR_UI::config()->color_mod (fill_color_name, mod_name);
                        } else {
-                               f = fill_color;
+                               c = ARDOUR_UI::config()->color_mod (fill_color, mod_name);
                        }
                }
        }
 
-       return UINT_RGBA_CHANGE_A (f, o);
+       return c;
 }
 
 /**