some modest improvements in the html rendering of key bindings, plus use of normal...

[ardour.git] / libs / gtkmm2ext / pixfader.cc

diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index b75f9f71c1774a984f389e5442a0c5fbbed6c21b..64ee449646e5f310d824258bccd61a29d6150933 100644 (file)
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -71,7 +71,7 @@ PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int
 
        _adjustment.signal_value_changed().connect (mem_fun (*this, &PixFader::adjustment_changed));
        _adjustment.signal_changed().connect (mem_fun (*this, &PixFader::adjustment_changed));
-
+       signal_grab_broken_event ().connect (mem_fun (*this, &PixFader::on_grab_broken_event));
        if (_orien == VERT) {
                CairoWidget::set_size_request(_girth, _span);
        } else {
@@ -85,6 +85,15 @@ PixFader::~PixFader ()
        if (_layout) _layout.clear (); // drop reference to existing layout
 }
 
+void
+PixFader::flush_pattern_cache () {
+       for (list<FaderImage*>::iterator f = _patterns.begin(); f != _patterns.end(); ++f) {
+               cairo_pattern_destroy ((*f)->pattern);
+       }
+       _patterns.clear();
+}
+
+
 cairo_pattern_t*
 PixFader::find_pattern (double afr, double afg, double afb,
                        double abr, double abg, double abb,
@@ -325,7 +334,7 @@ PixFader::render (cairo_t *cr, cairo_rectangle_t* area)
                Gtkmm2ext::rounded_rectangle (cr, CORNER_OFFSET, CORNER_OFFSET, w-CORNER_SIZE, h-CORNER_SIZE, CORNER_RADIUS);
                cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.4);
                cairo_fill (cr);
-       } else if (_hovering) {
+       } else if (_hovering && CairoWidget::widget_prelight()) {
                Gtkmm2ext::rounded_rectangle (cr, CORNER_OFFSET, CORNER_OFFSET, w-CORNER_SIZE, h-CORNER_SIZE, CORNER_RADIUS);
                cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.1);
                cairo_fill (cr);
@@ -347,6 +356,9 @@ PixFader::on_size_request (GtkRequisition* req)
 void
 PixFader::on_size_allocate (Gtk::Allocation& alloc)
 {
+       int old_girth = _girth;
+       int old_span = _span;
+
        CairoWidget::on_size_allocate(alloc);
 
        if (_orien == VERT) {
@@ -357,7 +369,7 @@ PixFader::on_size_allocate (Gtk::Allocation& alloc)
                _span = alloc.get_width ();
        }
 
-       if (is_realized()) {
+       if (is_realized() && ((old_girth != _girth) || (old_span != _span))) {
                /* recreate patterns in case we've changed size */
                create_patterns ();
        }
@@ -365,6 +377,18 @@ PixFader::on_size_allocate (Gtk::Allocation& alloc)
        update_unity_position ();
 }
 
+bool
+PixFader::on_grab_broken_event (GdkEventGrabBroken* ev)
+{
+       if (_dragging) {
+               remove_modal_grab();
+               _dragging = false;
+               gdk_pointer_ungrab (GDK_CURRENT_TIME);
+               StopGesture ();
+       }
+       return (_tweaks & NoButtonForward) ? true : false;
+}
+
 bool
 PixFader::on_button_press_event (GdkEventButton* ev)
 {
@@ -688,7 +712,7 @@ PixFader::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
                _text = "";
                set_text (txt, _centered_text, false);
        }
-       /* patterns are cached and re-created as needed 
+       /* patterns are cached and re-created as needed
         * during 'expose' in the GUI thread */
        _pattern = 0;
        queue_draw ();