summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-06-12 16:06:31 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-06-12 16:06:31 -0400
commit85e2c60673278761a356971f1d5f94985295232b (patch)
treeb7c5dea61cba0ec26c2b01d896e3e8f1356cc072 /gtk2_ardour
parentea355bfe15c8490ebc81fd093eeae8359fed77fa (diff)
add back click behaviour for canvas rulers, and also cursor enforcement
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_mouse.cc29
1 files changed, 28 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 3230614aed..8f84d5f602 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -793,6 +793,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MarkerBarItem:
case TempoBarItem:
case MeterBarItem:
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
_drags->set (new CursorDrag (this, *playhead_cursor, false), event);
}
@@ -1379,7 +1383,11 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
case CdMarkerBarItem:
case TransportMarkerBarItem:
case StreamItem:
- /* button press on these events never does anything to
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
+ /* button press on these items never does anything to
change the editing mode.
*/
break;
@@ -1596,6 +1604,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case TempoBarItem:
case MeterBarItem:
case VideoBarItem:
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
popup_ruler_menu (where, item_type);
break;
@@ -1708,6 +1720,13 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
return true;
break;
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
+ return true;
+ break;
+
default:
break;
}
@@ -1981,6 +2000,10 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
case CdMarkerBarItem:
case MeterBarItem:
case TempoBarItem:
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
if (is_drawable()) {
set_canvas_cursor (_cursors->timebar);
}
@@ -2127,6 +2150,10 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
case MeterBarItem:
case TempoBarItem:
case MarkerBarItem:
+ case TimecodeRulerItem:
+ case SamplesRulerItem:
+ case MinsecRulerItem:
+ case BBTRulerItem:
if (is_drawable()) {
set_canvas_cursor (current_canvas_cursor);
}