From 05caa9caa1ace0cfa029f034345eb1a0602b86a4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 13 Apr 2013 07:29:49 -0400 Subject: [PATCH] removal of sundry Adjustments and consolidation of scrolling around two editor-owned Adjustments --- gtk2_ardour/editor.cc | 4 ++++ gtk2_ardour/editor.h | 5 ++--- gtk2_ardour/editor_canvas.cc | 25 +++---------------------- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 9050797216..04f4f514fd 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -254,6 +254,10 @@ Editor::Editor () */ , vertical_adjustment (0.0, 0.0, 10.0, 400.0) + , horizontal_adjustment (0.0, 0.0, 1e16) + , unused_adjustment (0.0, 0.0, 10.0, 400.0) + + , controls_layout (unused_adjustment, vertical_adjustment) /* tool bar related */ diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6158aac5e8..2da7650ce5 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -696,12 +696,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD ArdourCanvas::GtkCanvas* _track_canvas; ArdourCanvas::GtkCanvasViewport* _track_canvas_viewport; - Gtk::Adjustment* _track_canvas_hadj; - Gtk::Adjustment* _track_canvas_vadj; ArdourCanvas::GtkCanvas* _time_bars_canvas; ArdourCanvas::GtkCanvasViewport* _time_bars_canvas_viewport; - Gtk::Adjustment* _time_bars_canvas_hadj; Gtk::Adjustment* _time_bars_canvas_vadj; bool within_track_canvas; @@ -970,7 +967,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /** the adjustment that controls the overall editor vertical scroll position */ Gtk::Adjustment vertical_adjustment; + Gtk::Adjustment horizontal_adjustment; + Gtk::Adjustment unused_adjustment; // yes, really; Gtk::Layout constructor requires refs Gtk::Layout controls_layout; bool control_layout_scroll (GdkEventScroll* ev); void reset_controls_layout_width (); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 0b133cea19..901b433c84 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -68,16 +68,11 @@ const double max_canvas_coordinate = (double) JACK_MAX_FRAMES; void Editor::initialize_canvas () { - /* XXX */ - - _track_canvas_hadj = new Adjustment (0, 0, 1e16); - _track_canvas_vadj = new Adjustment (0, 0, 1e16); - _track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (*_track_canvas_hadj, *_track_canvas_vadj); + _track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment); _track_canvas = _track_canvas_viewport->canvas (); - _time_bars_canvas_hadj = new Adjustment (0, 0, 1e16); _time_bars_canvas_vadj = new Adjustment (0, 0, 1e16); - _time_bars_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (*_time_bars_canvas_hadj, *_time_bars_canvas_vadj); + _time_bars_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, *_time_bars_canvas_vadj); _time_bars_canvas = _time_bars_canvas_viewport->canvas (); _verbose_cursor = new VerboseCursor (this); @@ -736,10 +731,6 @@ Editor::ensure_time_axis_view_is_visible (const TimeAxisView& tav) void Editor::tie_vertical_scrolling () { - _track_canvas_vadj->set_value (vertical_adjustment.get_value ()); - - controls_layout.get_vadjustment()->set_value (vertical_adjustment.get_value()); - if (pending_visual_change.idle_handler_id < 0) { _summary->set_overlays_dirty (); } @@ -748,8 +739,7 @@ Editor::tie_vertical_scrolling () void Editor::set_horizontal_position (double p) { - _track_canvas_hadj->set_value (p); - _time_bars_canvas_hadj->set_value (p); + horizontal_adjustment.set_value (p); leftmost_frame = (framepos_t) floor (p * samples_per_pixel); @@ -763,15 +753,6 @@ Editor::set_horizontal_position (double p) update_video_timeline(); HorizontalPositionChanged (); /* EMIT SIGNAL */ - -#ifndef GTKOSX - if (!autoscroll_active && !_stationary_playhead) { - /* force rulers and canvas to move in lock step */ - while (gtk_events_pending ()) { - gtk_main_iteration (); - } - } -#endif } // CAIROCANVAS