summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-10-23 17:31:03 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-10-23 17:31:03 +0000
commit8330f2828e41313e65823b4881291d423632a3bc (patch)
tree725a8a1f86295536e4aa590296e0af454d30b2f8
parent12ffa283905d46bac16462b5199da1b7645d4e2a (diff)
Force gtk rulers to update in lock step with canvas.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4001 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/editor_canvas.cc7
2 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 02d33a4c11..b7e5985497 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4331,7 +4331,7 @@ Editor::set_frames_per_unit (double fpu)
void
Editor::post_zoom ()
{
- nframes64_t cef=0;
+ nframes64_t cef = 0;
/*
// convert fpu to frame count
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 6373810678..daa820a7ad 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -800,7 +800,12 @@ Editor::scroll_canvas_horizontally ()
cursor_group->move (-x_delta, 0);
update_fixed_rulers ();
redisplay_tempo (true);
-
+ if (!autoscroll_active) {
+ /* force rulers and canvas to move in lock step */
+ while (gtk_events_pending ()) {
+ gtk_main_iteration ();
+ }
+ }
}
void