ardour/livetrax
13
0
Fork 0
Code

Fix autoscroll fudge calculations. Remove some unused

Browse Source 
code.  Should help with #4501.


git-svn-id: svn://localhost/ardour2/branches/3.0@10767 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-22 12:22:46 +00:00
parent 8016c4dec0
commit b78cb4d41a
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/editor_canvas.cc
View File

@ -509,9 +509,9 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert)
Gtk::Allocation editor_list = _the_notebook.get_allocation (); Gtk::Allocation editor_list = _the_notebook.get_allocation ();
int distance = root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width(); framecnt_t distance = pixel_to_frame (root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width());
if (_the_notebook.is_visible ()) { if (_the_notebook.is_visible ()) {
distance += editor_list.get_width(); distance += pixel_to_frame (editor_list.get_width());
} }
/* Note whether we're fudging the autoscroll (see autoscroll_fudge_threshold) */ /* Note whether we're fudging the autoscroll (see autoscroll_fudge_threshold) */
@ -572,21 +572,6 @@ Editor::autoscroll_canvas ()
GdkEventMotion ev; GdkEventMotion ev;
double new_pixel; double new_pixel;
double target_pixel; double target_pixel;
/* Work out whether the right-hand side of this window is next to the edge of the screen */
Glib::RefPtr<Gdk::Window> gdk_window = get_window ();
Gdk::Rectangle window_rect;
gdk_window->get_frame_extents (window_rect);
Glib::RefPtr<Gdk::Screen> screen = get_screen ();
Gdk::Rectangle root_rect;
screen->get_root_window()->get_frame_extents (root_rect);
int distance = root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width();
if (_the_notebook.is_visible ()) {
distance += _the_notebook.get_allocation().get_width();
}
if (autoscroll_x_distance != 0) { if (autoscroll_x_distance != 0) {