,arker_drag_line height is now physical screens height, no border on zoom box, whites...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3921 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index dd7af36978b610888680ccadb24b1e1c4e4b0e97..28156cdca4a74a1d54c2d22a4094d00637a0d93f 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2890,7 +2890,7 @@ Editor::setup_toolbar ()
        /* Zoom */
        
        zoom_box.set_spacing (1);
-       zoom_box.set_border_width (2);
+       zoom_box.set_border_width (0);
 
        zoom_in_button.set_name ("EditorTimeButton");
        zoom_in_button.set_size_request(-1,16);

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 10892fe449ae524f0afefaaf05639af36eeda608..ab0ce8532871ba6b83b6b2aef5b7f99c1b9ece02 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -193,7 +193,7 @@ Editor::initialize_canvas ()
        cd_marker_group = new ArdourCanvas::Group (*timebar_group, 0.0, 0.0);
 
        marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 0.0));
-       marker_drag_line_points.push_back(Gnome::Art::Point(0.0, 1.0));
+       marker_drag_line_points.push_back(Gnome::Art::Point(0.0, physical_screen_height));
 
        marker_drag_line = new ArdourCanvas::Line (*timebar_group);
        marker_drag_line->property_width_pixels() = 1;
@@ -323,7 +323,6 @@ Editor::track_canvas_size_allocated ()
                        (*x)->set_line_vpos (0, canvas_height);
                }
 
-               //      marker_drag_line_points.back().set_y(canvas_height);
                range_marker_drag_rect->property_y2() = canvas_height;
                transport_loop_range_rect->property_y2() = canvas_height;
                transport_punch_range_rect->property_y2() = canvas_height;

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 0ae1431766de36fe2b29a710c24ef242c791eeba..f2f09b1d824e831675e4d74b531e75c18344fdf7 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -787,7 +787,7 @@ Editor::update_ruler_visibility ()
        vertical_adjustment.set_upper(vertical_adjustment.get_upper() + vertical_pos_delta);
        full_canvas_height += vertical_pos_delta;
 
-       if (vertical_adjustment.get_value() !=0 && (vertical_adjustment.get_value() + canvas_height >= full_canvas_height)) {
+       if (vertical_adjustment.get_value() != 0 && (vertical_adjustment.get_value() + canvas_height >= full_canvas_height)) {
                /*if we're at the bottom of the canvas, don't move the _trackview_group*/
                vertical_adjustment.set_value (full_canvas_height - canvas_height + 1);
        } else {