diff options
| -rw-r--r-- | gtk2_ardour/panner.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/barcontroller.cc | 28 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/barcontroller.h | 1 |
4 files changed, 30 insertions, 3 deletions
diff --git a/gtk2_ardour/panner.cc b/gtk2_ardour/panner.cc index 145ef020e3..2f223879b2 100644 --- a/gtk2_ardour/panner.cc +++ b/gtk2_ardour/panner.cc @@ -32,7 +32,7 @@ static const int triangle_size = 5; PannerBar::PannerBar (Adjustment& adj, boost::shared_ptr<PBD::Controllable> c) : BarController (adj, c) { - set_style (BarController::Line); + set_style (BarController::Blob); } PannerBar::~PannerBar () diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 52c42cc63c..b038ac6f06 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -492,7 +492,7 @@ PannerUI::setup_pan () _position_fader = new BarController (_position_adjustment, _panner->direction_control()); _position_fader->set_size_request (-1, pan_bar_height/2); _position_fader->set_name ("PanSlider"); - _position_fader->set_style (BarController::Line); + _position_fader->set_style (BarController::Blob); ARDOUR_UI::instance()->set_tip (_position_fader, _("Pan Position")); _position_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &PannerUI::position_adjusted)); _panner->direction_control()->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::show_position, this), gui_context()); diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 5c0d444be7..8db8116ed6 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -244,9 +244,10 @@ BarController::mouse_control (double x, GdkWindow* window, double scaling) delta = x - grab_x; grab_x = x; - + switch (_style) { case Line: + case Blob: case LeftToRight: case CenterOut: fract = scaling * (delta / (darea.get_width() - 2)); @@ -302,6 +303,31 @@ BarController::expose (GdkEventExpose* /*event*/) win->draw_line (get_style()->get_fg_gc (get_state()), x1, 0, x1, h); break; + case Blob: + w = darea.get_width() - 1; + h = darea.get_height(); + x1 = (gint) floor (w * fract); + x2 = min (w-2,h-2); + + if (use_parent) { + parent = get_parent(); + + if (parent) { + win->draw_rectangle (parent->get_style()->get_fg_gc (parent->get_state()), + true, + 0, 0, darea.get_width(), darea.get_height()); + } + + } else { + + win->draw_rectangle (get_style()->get_bg_gc (get_state()), + true, + 0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height()); + } + + win->draw_arc (get_style()->get_fg_gc (get_state()), true, x1, ((h-2)/2)-1, x2, x2, 0, 360 * 64); + break; + case CenterOut: w = darea.get_width(); h = darea.get_height()-2; diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h index 1a0b78dabe..e0e14f1c26 100644 --- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h @@ -37,6 +37,7 @@ class BarController : public Gtk::Frame LeftToRight, RightToLeft, Line, + Blob, CenterOut, TopToBottom, |