summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-10 22:22:29 +0000
committerDavid Robillard <d@drobilla.net>2008-01-10 22:22:29 +0000
commit8a2e30816ee392b871c5918f769f68cc0196a893 (patch)
treeeb85739049c0adc6186eea635aaaf65ef03f038f /gtk2_ardour/editor_canvas.cc
parentbb457bb960c5bd7ed538f9d31477293415739f68 (diff)
Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 87a92790bc..68e0f62be4 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -337,7 +337,7 @@ Editor::track_canvas_size_allocated ()
if (playhead_cursor) playhead_cursor->set_length (canvas_height);
for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
- (*x)->set_line_length (canvas_height);
+ (*x)->set_line_length (full_canvas_height);
}
if (range_marker_drag_rect) {
@@ -366,11 +366,17 @@ Editor::track_canvas_size_allocated ()
}
compute_fixed_ruler_scale ();
+ range_marker_drag_rect->property_y2() = full_canvas_height;
+ transport_loop_range_rect->property_y2() = full_canvas_height;
+ transport_punch_range_rect->property_y2() = full_canvas_height;
+ transport_punchin_line->property_y2() = full_canvas_height;
+ transport_punchout_line->property_y2() = full_canvas_height;
+
update_fixed_rulers();
redisplay_tempo (true);
if (logo_item) {
- // logo_item->property_height() = canvas_height;
+ // logo_item->property_height() = full_canvas_height;
// logo_item->property_width() = canvas_width;
}