diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-20 05:41:12 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-20 05:41:12 +1000 |
| commit | c1b950373f9f33ef30c2df0da5e24953a8c6a25a (patch) | |
| tree | a00eb57cfa8a3975d53beb72741ce6fd77269e66 /gtk2_ardour/editor_mouse.cc | |
| parent | 869a9cb5df0a270adb184a59d52951ea26cfa750 (diff) | |
Amend last commit - remove some code.
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1bc242d3a2..01cb2175c1 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1754,7 +1754,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; } entered_marker = m_marker; - m_marker->set_enter_color (); + if (m_marker->meter().position_lock_style() == MusicTime) { + m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker")); + } else { + m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music")); + } break; case TempoMarkerItem: @@ -1762,7 +1766,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; } entered_marker = t_marker; - t_marker->set_enter_color (); + if (t_marker->tempo().position_lock_style() == MusicTime) { + t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker")); + } else { + t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music")); + } break; case FadeInHandleItem: @@ -1878,7 +1886,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) break; } entered_marker = 0; - m_marker->set_leave_color (); + if (m_marker->meter().position_lock_style() == MusicTime) { + m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker music")); + } else { + m_marker->set_color_rgba (UIConfiguration::instance().color ("meter marker")); + } break; case TempoMarkerItem: @@ -1886,7 +1898,11 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) break; } entered_marker = 0; - t_marker->set_leave_color (); + if (t_marker->tempo().position_lock_style() == MusicTime) { + t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker music")); + } else { + t_marker->set_color_rgba (UIConfiguration::instance().color ("tempo marker")); + } break; case FadeInTrimHandleItem: |