summaryrefslogtreecommitdiff
path: root/libs/gtkmm2ext
diff options
context:
space:
mode:
authorJesse Chappell <jesse@essej.net>2006-12-30 06:37:00 +0000
committerJesse Chappell <jesse@essej.net>2006-12-30 06:37:00 +0000
commit4fa71e154f3cebb3d4bf8f46ec3f19d6aeaded72 (patch)
tree7f3f188b8ef69fbc29599d1cf810406e7a8a8c98 /libs/gtkmm2ext
parent34a813c1a13263c2f37b945771093f428efb9692 (diff)
tweaked panner appearance and consistency, panner line now distinct color from triangles. shift-click now reverts panner to center, left or right depending on number of channels. minor updates to osx app build script. fixed region editor re-show problem.
git-svn-id: svn://localhost/ardour2/trunk@1253 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r--libs/gtkmm2ext/barcontroller.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 5dff70cedf..f59d192ff1 100644
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -229,7 +229,7 @@ BarController::motion (GdkEventMotion* ev)
gint
BarController::mouse_control (double x, GdkWindow* window, double scaling)
{
- double fract;
+ double fract = 0.0;
double delta;
if (window != grab_window) {
@@ -263,7 +263,7 @@ BarController::expose (GdkEventExpose* event)
{
Glib::RefPtr<Gdk::Window> win (darea.get_window());
Widget* parent;
- gint x1, x2, y1, y2;
+ gint x1=0, x2=0, y1=0, y2=0;
gint w, h;
double fract;
@@ -275,6 +275,7 @@ BarController::expose (GdkEventExpose* event)
switch (_style) {
case Line:
+ h = darea.get_height();
x1 = (gint) floor (w * fract);
x2 = x1;
y1 = 0;
@@ -293,10 +294,10 @@ BarController::expose (GdkEventExpose* event)
win->draw_rectangle (get_style()->get_bg_gc (get_state()),
true,
- 0, 0, darea.get_width(), darea.get_height());
+ 0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height());
}
- win->draw_line (get_style()->get_base_gc (get_state()), x1, 0, x1, darea.get_height());
+ win->draw_line (get_style()->get_fg_gc (get_state()), x1, 0, x1, h);
break;
case CenterOut: