From c86210a9d5bdb7b36ad58552a1f99f53d48781b3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Sep 2008 21:27:39 +0000 Subject: merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_canvas_events.cc | 65 +++---------------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) (limited to 'gtk2_ardour/editor_canvas_events.cc') diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index dd107d8d02..e55ab9bed0 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -72,9 +72,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) */ track_canvas->get_pointer (x, y); track_canvas->window_to_world (x, y, wx, wy); - wx += horizontal_adjustment.get_value(); - wy += vertical_adjustment.get_value(); - + GdkEvent event; event.type = GDK_BUTTON_RELEASE; event.button.x = wx; @@ -89,7 +87,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500); - if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) { + if (!(current_stepping_trackview = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize))) { return false; } } @@ -110,9 +108,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) //if (ev->state == GDK_CONTROL_MASK) { track_canvas->get_pointer (x, y); track_canvas->window_to_world (x, y, wx, wy); - wx += horizontal_adjustment.get_value(); - wy += vertical_adjustment.get_value(); - + GdkEvent event; event.type = GDK_BUTTON_RELEASE; event.button.x = wx; @@ -127,7 +123,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500); - if (!(current_stepping_trackview = trackview_by_y_position (ev->y))) { + if (!(current_stepping_trackview = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize))) { return false; } } @@ -177,55 +173,6 @@ Editor::track_canvas_scroll_event (GdkEventScroll *event) return false; } -bool -Editor::time_canvas_scroll (GdkEventScroll* ev) -{ - nframes64_t xdelta; - int direction = ev->direction; - - switch (direction) { - case GDK_SCROLL_UP: - temporal_zoom_step (true); - break; - - case GDK_SCROLL_DOWN: - temporal_zoom_step (false); - break; - - case GDK_SCROLL_LEFT: - xdelta = (current_page_frames() / 2); - if (leftmost_frame > xdelta) { - reset_x_origin (leftmost_frame - xdelta); - } else { - reset_x_origin (0); - } - break; - - case GDK_SCROLL_RIGHT: - xdelta = (current_page_frames() / 2); - if (max_frames - xdelta > leftmost_frame) { - reset_x_origin (leftmost_frame + xdelta); - } else { - reset_x_origin (max_frames - current_page_frames()); - } - break; - - default: - /* what? */ - break; - } - - return false; -} - -bool -Editor::time_canvas_scroll_event (GdkEventScroll *event) -{ - time_canvas->grab_focus(); - time_canvas_scroll (event); - return false; -} - bool Editor::track_canvas_button_press_event (GdkEventButton *event) { @@ -260,10 +207,6 @@ Editor::track_canvas_motion (GdkEvent *ev) verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20); } -#ifdef GTKOSX - flush_canvas (); -#endif - return false; } -- cgit v1.2.3