tweak panner drawing

git-svn-id: svn://localhost/ardour2/trunk@1420 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 46c7057ea32478243da48d17300b8f5264c08d54..488623ce93cee52359a795e52e6d9d4f99ab0cb0 100644 (file)
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -143,7 +143,7 @@ style "transport_base" = "medium_bold_text"
 
 style "black_mackie_menu_bar"
 {
-  font_name = "sans bold 9"
+  font_name = "sans bold 7"
   fg[NORMAL] = { 1.0, 1.0, 1.0 }
   bg[NORMAL] = { 0, 0, 0 }
 }

diff --git a/gtk2_ardour/panner.cc b/gtk2_ardour/panner.cc
index bb9b43218426bfe33219f85527cb98bc6cac99ca..d54d6b89ac9bc540c068127fade1d7d25f8210fe 100644 (file)
--- a/gtk2_ardour/panner.cc
+++ b/gtk2_ardour/panner.cc
@@ -55,23 +55,23 @@ PannerBar::expose (GdkEventExpose* ev)
        points[0].x = (darea.get_width()/2 - triangle_size);
        points[0].y = 0;
 
-       points[1].x = (darea.get_width()/2 + triangle_size) - 1;
+       points[1].x = (darea.get_width()/2 + triangle_size);
        points[1].y = 0;
        
-       points[2].x = darea.get_width()/2 - 1;
+       points[2].x = darea.get_width()/2;
        points[2].y = triangle_size - 1;
 
        gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3); 
 
        // right
 
-       points[0].x = (darea.get_width() - triangle_size) - 1;
+       points[0].x = (darea.get_width() - triangle_size);
        points[0].y = 0;
 
-       points[1].x = darea.get_width() - 1;
+       points[1].x = darea.get_width();
        points[1].y = 0;
        
-       points[2].x = darea.get_width() - 1;
+       points[2].x = darea.get_width();
        points[2].y = triangle_size;
 
        gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3);

diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index f59d192ff1402a78575d74a060f8a64128277699..c3c15b4281bf47ff229da0b90f3b6f3be3a054cb 100644 (file)
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -267,14 +267,12 @@ BarController::expose (GdkEventExpose* event)
        gint w, h;
        double fract;
 
-       w = darea.get_width() - 2;
-       h = darea.get_height() - 2;
-
        fract = ((adjustment.get_value() - adjustment.get_lower()) /
                 (adjustment.get_upper() - adjustment.get_lower()));
        
        switch (_style) {
        case Line:
+               w = darea.get_width() - 1;
                h = darea.get_height();
                x1 = (gint) floor (w * fract);
                x2 = x1;
@@ -304,6 +302,10 @@ BarController::expose (GdkEventExpose* event)
                break;
 
        case LeftToRight:
+
+               w = darea.get_width() - 2;
+               h = darea.get_height() - 2;
+
                x1 = 0;
                x2 = (gint) floor (w * fract);
                y1 = 0;