remove "canvasvar_" from all functions related to obtaining values from ARDOUR_UI...

[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 c1e62e67d0ef9f2e9b7d244d7dbfa72da6871062..063fc7305710a0e7b086cd1e7dc07db86fb0fafd 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -56,6 +56,7 @@ using namespace Editing;
 using namespace Glib;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace Gtkmm2ext;
 
 Pango::FontDescription TimeAxisViewItem::NAME_FONT;
@@ -72,7 +73,7 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
 void
 TimeAxisViewItem::set_constant_heights ()
 {
-        NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
+        NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont());
 
         Gtk::Window win;
         Gtk::Label foo;
@@ -190,8 +191,8 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, 2.0, trackview.current_height()));
        CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
        vestigial_frame->hide ();
-       vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
-       vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
+       vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_VestigialFrame());
+       vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_VestigialFrame());
 
        if (visibility & ShowFrame) {
                frame = new ArdourCanvas::Rectangle (group, 
@@ -200,7 +201,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                                                                         trackview.current_height() - 1.0));
 
                CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
-               
+
                if (Config->get_show_name_highlight()) {
                        frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
                } else {
@@ -208,9 +209,9 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                }
 
                if (_recregion) {
-                       frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
+                       frame->set_outline_color (ARDOUR_UI::config()->get_RecordingRect());
                } else {
-                       frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+                       frame->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame());
                }
 
        } else {
@@ -254,6 +255,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                        name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
                }
                name_text->set_font_description (NAME_FONT);
+               name_text->set_ignore_events (true);
        } else {
                name_text = 0;
        }
@@ -540,6 +542,21 @@ TimeAxisViewItem::set_selected(bool yn)
        if (_selected != yn) {
                Selectable::set_selected (yn);
                set_frame_color ();
+               set_name_text_color ();
+
+               if (frame) {
+                       if (!Config->get_show_name_highlight() && yn) {
+                               frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP));
+                               frame->set_y1 (_height - 1.0);
+                       } else {
+                               if (Config->get_show_name_highlight()) {
+                                       frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+                               } else {
+                                       frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM));
+                               }
+                               frame->set_y1 (_height);
+                       }
+               }
        }
 }
 
@@ -590,7 +607,18 @@ TimeAxisViewItem::set_height (double height)
        }
 
        if (frame) {
-               frame->set_y1 (height);
+               if (!Config->get_show_name_highlight() && _selected) {
+                       frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP));
+                       frame->set_y1 (_height - 1.0);
+               } else {
+                       if (Config->get_show_name_highlight()) {
+                               frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+                       } else {
+                               frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM));
+                       }
+                       frame->set_y1 (_height);
+               }
+
                if (frame_handle_start) {
                        frame_handle_start->set_y1 (height);
                        frame_handle_end->set_y1 (height);
@@ -696,7 +724,7 @@ TimeAxisViewItem::set_name_text_color ()
                f = get_fill_color ();
        }
 
-       name_text->set_color (contrasting_text_color (f));
+       name_text->set_color (ArdourCanvas::contrasting_text_color (f));
 }
 
 uint32_t
@@ -715,7 +743,7 @@ TimeAxisViewItem::fill_opacity () const
                return 130;
        }
 
-       uint32_t col = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+       uint32_t col = ARDOUR_UI::config()->get_FrameBase();
        return UINT_RGBA_A (col);
 }
 
@@ -729,7 +757,7 @@ TimeAxisViewItem::get_fill_color () const
 
        if (_selected) {
 
-                f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+                f = ARDOUR_UI::config()->get_SelectedFrameBase();
 
                if (o == 0) {
                        /* some condition of this item has set fill opacity to
@@ -742,10 +770,10 @@ TimeAxisViewItem::get_fill_color () const
        } else {
 
                if (_recregion) {
-                       f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+                       f = ARDOUR_UI::config()->get_RecordingRect();
                } else {
                        if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-                               f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+                               f = ARDOUR_UI::config()->get_FrameBase();
                        } else {
                                f = fill_color;
                        }
@@ -772,9 +800,9 @@ TimeAxisViewItem::set_frame_color()
                uint32_t f;
 
                 if (_selected) {
-                        f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
+                        f = ARDOUR_UI::config()->get_SelectedTimeAxisFrame();
                 } else {
-                        f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
+                        f = ARDOUR_UI::config()->get_TimeAxisFrame();
                 }
 
                 if (!rect_visible) {
@@ -831,11 +859,11 @@ TimeAxisViewItem::set_trim_handle_colors()
 #else
        if (frame_handle_start) {
                if (position_locked) {
-                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
-                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
+                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
+                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
                } else {
-                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
-                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
+                       frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
+                       frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
                }
        }
 #endif