diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-20 04:36:52 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-20 04:36:52 +1000 |
| commit | 869a9cb5df0a270adb184a59d52951ea26cfa750 (patch) | |
| tree | d3078f571f3c5b0cb43339ece47d204885fff8f3 /gtk2_ardour/editor_mouse.cc | |
| parent | 949dd8245d1f6c6b0f6815d9f0bd911c38cbfe89 (diff) | |
Swap tempo/meter colours when hovering. Use entered marker for these as well.
- Note : entered_marker modifies the 'p' press, locating to the
currently hovered-over marker.
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 0adbe42818..1bc242d3a2 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1688,6 +1688,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ { ControlPoint* cp; ArdourMarker * marker; + MeterMarker* m_marker = 0; + TempoMarker* t_marker = 0; double fraction; bool ret = true; @@ -1745,9 +1747,22 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } entered_marker = marker; marker->set_color_rgba (UIConfiguration::instance().color ("entered marker")); - // fall through + break; + case MeterMarkerItem: + if ((m_marker = static_cast<MeterMarker *> (item->get_data ("marker"))) == 0) { + break; + } + entered_marker = m_marker; + m_marker->set_enter_color (); + break; + case TempoMarkerItem: + if ((t_marker = static_cast<TempoMarker *> (item->get_data ("marker"))) == 0) { + break; + } + entered_marker = t_marker; + t_marker->set_enter_color (); break; case FadeInHandleItem: @@ -1822,6 +1837,8 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; ArdourMarker *marker; + TempoMarker *t_marker; + MeterMarker *m_marker; Location *loc; bool is_start; bool ret = true; @@ -1854,9 +1871,22 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) if ((loc = find_location_from_marker (marker, is_start)) != 0) { location_flags_changed (loc); } - // fall through + break; + case MeterMarkerItem: + if ((m_marker = static_cast<MeterMarker *> (item->get_data ("marker"))) == 0) { + break; + } + entered_marker = 0; + m_marker->set_leave_color (); + break; + case TempoMarkerItem: + if ((t_marker = static_cast<TempoMarker *> (item->get_data ("marker"))) == 0) { + break; + } + entered_marker = 0; + t_marker->set_leave_color (); break; case FadeInTrimHandleItem: |