From 9926b00a1f84f6c81e80fa77d1202283af0d910e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 9 Feb 2011 14:28:18 +0000 Subject: [PATCH] panner visual tweaks git-svn-id: svn://localhost/ardour2/branches/3.0@8802 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/mono_panner.cc | 12 ++++++++---- gtk2_ardour/panner_ui.cc | 2 +- gtk2_ardour/stereo_panner.cc | 8 ++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 8b3cbc73b2..9f21039250 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -216,13 +216,17 @@ MonoPanner::on_expose_event (GdkEventExpose* ev) /* 2 lines that connect them both */ context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); context->set_line_width (1.0); - context->move_to (left + half_lr_box, half_lr_box+step_down); - context->line_to (right - half_lr_box, half_lr_box+step_down); + + /* make the lines a little longer than they need to be, because the corners of + the boxes are rounded and we don't want a gap + */ + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down); context->stroke (); - context->move_to (left + half_lr_box, half_lr_box+step_down+lr_box_size); - context->line_to (right - half_lr_box, half_lr_box+step_down+lr_box_size); + context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down+lr_box_size); + context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down+lr_box_size); context->stroke (); /* draw the position indicator */ diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index af207c20c1..49720d781e 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -47,7 +47,7 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -const int PannerUI::pan_bar_height = 40; +const int PannerUI::pan_bar_height = 35; PannerUI::PannerUI (Session* s) : _current_nouts (-1) diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 128bfe6c77..cff4ebd898 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -192,6 +192,14 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) left = center - pan_spread; // center of left box right = center + pan_spread; // center of right box + /* center line */ + + context->set_line_width (1.0); + context->move_to ((usable_width + lr_box_size)/2.0, 0); + context->rel_line_to (0, height); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke (); + /* compute & draw the line through the box */ context->set_line_width (2); -- 2.30.2