diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-21 12:47:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-21 12:47:53 -0400 |
| commit | b73f7256766f86a208d8264285334ee8e49310f7 (patch) | |
| tree | a247a04658841b9cd1cb5db85c9e435e511ee5b6 /gtk2_ardour/editor_canvas.cc | |
| parent | 46f5c0c769fe0e01b0c4672f47df468459b98471 (diff) | |
remove mouse zoom mode; bind z to zoom-to-range
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1fc1cec434..dcbcd44da0 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -125,11 +125,6 @@ Editor::initialize_canvas () _trackview_group = new ArdourCanvas::Container (hv_scroll_group); CANVAS_DEBUG_NAME (_trackview_group, "Canvas TrackViews"); - // used to show zoom mode active zooming - zoom_rect = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0)); - zoom_rect->hide(); - zoom_rect->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0)); - // used as rubberband rect rubberband_rect = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, 0.0, 0.0)); rubberband_rect->hide(); @@ -924,9 +919,6 @@ Editor::color_handler() transport_punchin_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine()); transport_punchout_line->set_outline_color (ARDOUR_UI::config()->get_canvasvar_PunchLine()); - zoom_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect()); - zoom_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_ZoomRect()); - rubberband_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RubberBandRect()); rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->get_canvasvar_RubberBandRect()); @@ -954,21 +946,12 @@ Editor::horizontal_position () const bool Editor::track_canvas_key_press (GdkEventKey*) { - /* XXX: event does not report the modifier key pressed down, AFAICS, so use the Keyboard object instead */ - if (mouse_mode == Editing::MouseZoom && Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { - set_canvas_cursor (_cursors->zoom_out, true); - } - return false; } bool Editor::track_canvas_key_release (GdkEventKey*) { - if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { - set_canvas_cursor (_cursors->zoom_in, true); - } - return false; } @@ -1129,14 +1112,6 @@ Editor::which_mode_cursor () const mode_cursor = _cursors->cross_hair; break; - case MouseZoom: - if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { - mode_cursor = _cursors->zoom_out; - } else { - mode_cursor = _cursors->zoom_in; - } - break; - case MouseTimeFX: mode_cursor = _cursors->time_fx; // just use playhead break; |