From 68a690b403791498293a6cfb2f70b5e245390760 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 3 Feb 2007 20:43:36 +0000 Subject: [PATCH] tweak panner drawing git-svn-id: svn://localhost/ardour2/trunk@1420 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour2_ui.rc | 2 +- gtk2_ardour/panner.cc | 10 +++++----- libs/gtkmm2ext/barcontroller.cc | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index 46c7057ea3..488623ce93 100644 --- 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 bb9b432184..d54d6b89ac 100644 --- 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 f59d192ff1..c3c15b4281 100644 --- 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; -- 2.30.2