diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-04-16 07:30:09 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-04-16 07:30:09 -0400 |
| commit | e324249d8ca7afa677420dbb2baa6bb26e4b411f (patch) | |
| tree | 02ce04eda2c0637b734805918a49614f96d6f932 /gtk2_ardour/time_axis_view_item.cc | |
| parent | 981754781a55b154bb8e4022c9029504e430a44a (diff) | |
fix logic for Config->show_name_highlight (reversed from inital experiments)
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index da097d1b44..d16b7e4e4d 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -93,11 +93,11 @@ TimeAxisViewItem::set_constant_heights () TRX: Y_OFFSET is measured from the top of the time axis view item. */ if (Config->get_show_name_highlight()) { - NAME_Y_OFFSET = 3; - NAME_HIGHLIGHT_SIZE = 0; - } else { NAME_Y_OFFSET = height + 1; NAME_HIGHLIGHT_SIZE = height + 2; + } else { + NAME_Y_OFFSET = 3; + NAME_HIGHLIGHT_SIZE = 0; } NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; } @@ -251,9 +251,9 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons 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()) { - name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET)); - } else { 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)); } name_text->set_font_description (NAME_FONT); } else { @@ -585,9 +585,9 @@ TimeAxisViewItem::set_height (double height) if (visibility & ShowNameText) { if (Config->get_show_name_highlight()) { - name_text->set_y_position (NAME_Y_OFFSET); - } else { name_text->set_y_position (height - NAME_Y_OFFSET); + } else { + name_text->set_y_position (NAME_Y_OFFSET); } } |