diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
commit | aaea166135ace01709f7e0be64f40be80f4107ec (patch) | |
tree | 0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/editor_routes.cc | |
parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/editor_routes.cc')
-rw-r--r-- | gtk2_ardour/editor_routes.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index d0918a026a..6a60623cb1 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -534,15 +534,15 @@ EditorRoutes::redisplay () _editor->reset_controls_layout_height (position); _editor->reset_controls_layout_width (); - _editor->full_canvas_height = position + _editor->canvas_timebars_vsize; - _editor->vertical_adjustment.set_upper (_editor->full_canvas_height); + _editor->_full_canvas_height = position; + _editor->vertical_adjustment.set_upper (_editor->_full_canvas_height); - if ((_editor->vertical_adjustment.get_value() + _editor->_canvas_height) > _editor->vertical_adjustment.get_upper()) { + if ((_editor->vertical_adjustment.get_value() + _editor->_visible_canvas_height) > _editor->vertical_adjustment.get_upper()) { /* We're increasing the size of the canvas while the bottom is visible. We scroll down to keep in step with the controls layout. */ - _editor->vertical_adjustment.set_value (_editor->full_canvas_height - _editor->_canvas_height); + _editor->vertical_adjustment.set_value (_editor->_full_canvas_height - _editor->_visible_canvas_height); } } @@ -1305,8 +1305,8 @@ EditorRoutes::button_press (GdkEventButton* ev) int y_pos = tv->y_position(); //Clamp the y pos so that we do not extend beyond the canvas full height. - if (_editor->full_canvas_height - y_pos < _editor->_canvas_height){ - y_pos = _editor->full_canvas_height - _editor->_canvas_height; + if (_editor->full_canvas_height - y_pos < _editor->_visible_canvas_height){ + y_pos = _editor->full_canvas_height - _editor->_visible_canvas_height; } //Only scroll to if the track is visible |