X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fpixfader.cc;h=64ee449646e5f310d824258bccd61a29d6150933;hb=e16141c9aa87714e2e4e9357d0a60f8eb3e22faf;hp=bb10192401e3ef79b2700b2b0871fabbbd1de64c;hpb=ecf5d5f13754b9f5e9405c62402cc76dbe67e176;p=ardour.git diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index bb10192401..64ee449646 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -33,15 +33,19 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; -#define CORNER_RADIUS 4 +#define CORNER_RADIUS 2.5 #define CORNER_SIZE 2 #define CORNER_OFFSET 1 -#define FADER_RESERVE 6 // >= 1.5 * CORNER_RADIUS +#define FADER_RESERVE 6 std::list PixFader::_patterns; PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int fader_girth) - : adjustment (adj) + : _layout (0) + , _tweaks (Tweaks(0)) + , _adjustment (adj) + , _text_width (0) + , _text_height (0) , _span (fader_length) , _girth (fader_girth) , _min_span (fader_length) @@ -49,13 +53,11 @@ PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int , _orien (orientation) , _pattern (0) , _hovering (false) - , _last_drawn (-1) , _dragging (false) , _centered_text (true) - , _display_unity_line (true) , _current_parent (0) { - _default_value = adjustment.get_value(); + _default_value = _adjustment.get_value(); update_unity_position (); add_events ( @@ -67,13 +69,13 @@ PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int | Gdk::LEAVE_NOTIFY_MASK ); - adjustment.signal_value_changed().connect (mem_fun (*this, &PixFader::adjustment_changed)); - adjustment.signal_changed().connect (mem_fun (*this, &PixFader::adjustment_changed)); - + _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) { - DrawingArea::set_size_request(_girth, _span); + CairoWidget::set_size_request(_girth, _span); } else { - DrawingArea::set_size_request(_span, _girth); + CairoWidget::set_size_request(_span, _girth); } } @@ -83,6 +85,15 @@ PixFader::~PixFader () if (_layout) _layout.clear (); // drop reference to existing layout } +void +PixFader::flush_pattern_cache () { + for (list::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, @@ -133,8 +144,9 @@ PixFader::create_patterns () /* paint background + border */ cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, get_width(), 0); - cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.8,bg*0.8,bb*0.8, 1.0); - cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.6,bg*0.6,bb*0.6, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.4,bg*0.4,bb*0.4, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 0.25, br*0.6,bg*0.6,bb*0.6, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.8,bg*0.8,bb*0.8, 1.0); cairo_set_source (tc, shade_pattern); cairo_rectangle (tc, 0, 0, get_width(), get_height() * 2.0); cairo_fill (tc); @@ -163,8 +175,9 @@ PixFader::create_patterns () /* paint right shade (background section)*/ cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()); - cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.8,bg*0.8,bb*0.8, 1.0); - cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.6,bg*0.6,bb*0.6, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.4,bg*0.4,bb*0.4, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 0.25, br*0.6,bg*0.6,bb*0.6, 1.0); + cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.8,bg*0.8,bb*0.8, 1.0); cairo_set_source (tc, shade_pattern); cairo_rectangle (tc, 0, 0, get_width() * 2.0, get_height()); cairo_fill (tc); @@ -191,16 +204,9 @@ PixFader::create_patterns () cairo_surface_destroy (surface); } -bool -PixFader::on_expose_event (GdkEventExpose* ev) +void +PixFader::render (cairo_t *cr, cairo_rectangle_t* area) { - Cairo::RefPtr context = get_window()->create_cairo_context(); - cairo_t* cr = context->cobj(); - - // clip to expose area - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_clip (cr); - if (!_pattern) { create_patterns(); } @@ -214,9 +220,9 @@ PixFader::on_expose_event (GdkEventExpose* ev) */ CairoWidget::set_source_rgb_a (cr, get_style()->get_bg (get_state()), 1); - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); + cairo_rectangle (cr, area->x, area->y, area->width, area->height); cairo_fill (cr); - return true; + return; } OnExpose(); @@ -288,22 +294,22 @@ PixFader::on_expose_event (GdkEventExpose* ev) } /* draw the unity-position line if it's not at either end*/ - if (_display_unity_line && _unity_loc > CORNER_RADIUS) { - context->set_line_width (1); - context->set_line_cap (Cairo::LINE_CAP_ROUND); + if (!(_tweaks & NoShowUnityLine) && _unity_loc > CORNER_RADIUS) { + cairo_set_line_width(cr, 1); + cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); Gdk::Color c = get_style()->get_fg (Gtk::STATE_ACTIVE); - context->set_source_rgba (c.get_red_p() * 1.5, c.get_green_p() * 1.5, c.get_blue_p() * 1.5, 0.85); + cairo_set_source_rgba (cr, c.get_red_p() * 1.5, c.get_green_p() * 1.5, c.get_blue_p() * 1.5, 0.85); if (_orien == VERT) { if (_unity_loc < h - CORNER_RADIUS) { - context->move_to (1.5, _unity_loc + CORNER_OFFSET + .5); - context->line_to (_girth - 1.5, _unity_loc + CORNER_OFFSET + .5); - context->stroke (); + cairo_move_to (cr, 1.5, _unity_loc + CORNER_OFFSET + .5); + cairo_line_to (cr, _girth - 1.5, _unity_loc + CORNER_OFFSET + .5); + cairo_stroke (cr); } } else { if (_unity_loc < w - CORNER_RADIUS) { - context->move_to (_unity_loc - CORNER_OFFSET + .5, 1.5); - context->line_to (_unity_loc - CORNER_OFFSET + .5, _girth - 1.5); - context->stroke (); + cairo_move_to (cr, _unity_loc - CORNER_OFFSET + .5, 1.5); + cairo_line_to (cr, _unity_loc - CORNER_OFFSET + .5, _girth - 1.5); + cairo_stroke (cr); } } } @@ -328,15 +334,11 @@ PixFader::on_expose_event (GdkEventExpose* ev) 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); } - - _last_drawn = ds; - - return true; } void @@ -354,7 +356,10 @@ PixFader::on_size_request (GtkRequisition* req) void PixFader::on_size_allocate (Gtk::Allocation& alloc) { - DrawingArea::on_size_allocate(alloc); + int old_girth = _girth; + int old_span = _span; + + CairoWidget::on_size_allocate(alloc); if (_orien == VERT) { _girth = alloc.get_width (); @@ -364,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 (); } @@ -372,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) { @@ -382,7 +399,7 @@ PixFader::on_button_press_event (GdkEventButton* ev) gdk_pointer_ungrab (GDK_CURRENT_TIME); StopGesture (); } - return false; + return (_tweaks & NoButtonForward) ? true : false; } if (ev->button != 1 && ev->button != 2) { @@ -403,7 +420,7 @@ PixFader::on_button_press_event (GdkEventButton* ev) set_adjustment_from_event (ev); } - return true; + return (_tweaks & NoButtonForward) ? true : false; } bool @@ -420,26 +437,29 @@ PixFader::on_button_release_event (GdkEventButton* ev) StopGesture (); if (!_hovering) { - Keyboard::magic_widget_drop_focus(); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_drop_focus(); + } queue_draw (); } if (ev_pos == _grab_start) { /* no motion - just a click */ - const double slider_pos = display_span(); ev_pos = rint(ev_pos); if (ev->state & Keyboard::TertiaryModifier) { - adjustment.set_value (_default_value); + _adjustment.set_value (_default_value); } else if (ev->state & Keyboard::GainFineScaleModifier) { - adjustment.set_value (adjustment.get_lower()); + _adjustment.set_value (_adjustment.get_lower()); +#if 0 // ignore clicks } else if (ev_pos == slider_pos) { ; // click on current position, no move. } else if ((_orien == VERT && ev_pos < slider_pos) || (_orien == HORIZ && ev_pos > slider_pos)) { /* above the current display height, remember X Window coords */ - adjustment.set_value (adjustment.get_value() + adjustment.get_step_increment()); + _adjustment.set_value (_adjustment.get_value() + _adjustment.get_step_increment()); } else { - adjustment.set_value (adjustment.get_value() - adjustment.get_step_increment()); + _adjustment.set_value (_adjustment.get_value() - _adjustment.get_step_increment()); +#endif } } return true; @@ -471,51 +491,46 @@ PixFader::on_scroll_event (GdkEventScroll* ev) if (ev->state & Keyboard::GainFineScaleModifier) { if (ev->state & Keyboard::GainExtraFineScaleModifier) { - scale = 0.01; + scale = 0.005; } else { - scale = 0.05; + scale = 0.1; } } else { - scale = 0.25; + scale = 1.0; } if (_orien == VERT) { - - /* should left/right scroll affect vertical faders ? */ - switch (ev->direction) { - - case GDK_SCROLL_UP: - adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale)); - ret = true; - break; - case GDK_SCROLL_DOWN: - adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale)); - ret = true; - break; - default: - break; + case GDK_SCROLL_UP: + _adjustment.set_value (_adjustment.get_value() + (_adjustment.get_page_increment() * scale)); + ret = true; + break; + case GDK_SCROLL_DOWN: + _adjustment.set_value (_adjustment.get_value() - (_adjustment.get_page_increment() * scale)); + ret = true; + break; + default: + break; } } else { + int dir = ev->direction; - /* up/down scrolls should definitely affect horizontal faders - because they are so much easier to use - */ - - switch (ev->direction) { + if (ev->state & Keyboard::ScrollHorizontalModifier || !(_tweaks & NoVerticalScroll)) { + if (ev->direction == GDK_SCROLL_UP) dir = GDK_SCROLL_RIGHT; + if (ev->direction == GDK_SCROLL_DOWN) dir = GDK_SCROLL_LEFT; + } - case GDK_SCROLL_RIGHT: - case GDK_SCROLL_UP: - adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale)); - ret = true; - break; - case GDK_SCROLL_LEFT: - case GDK_SCROLL_DOWN: - adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale)); - ret = true; - break; - default: - break; + switch (dir) { + case GDK_SCROLL_RIGHT: + _adjustment.set_value (_adjustment.get_value() + (_adjustment.get_page_increment() * scale)); + ret = true; + break; + case GDK_SCROLL_LEFT: + _adjustment.set_value (_adjustment.get_value() - (_adjustment.get_page_increment() * scale)); + ret = true; + break; + default: + break; } } return ret; @@ -536,7 +551,7 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) if (ev->state & Keyboard::GainFineScaleModifier) { if (ev->state & Keyboard::GainExtraFineScaleModifier) { - scale = 0.05; + scale = 0.005; } else { scale = 0.1; } @@ -545,7 +560,9 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) double const delta = ev_pos - _grab_loc; _grab_loc = ev_pos; - double fract = (delta / _span); + const double off = FADER_RESERVE + ((_orien == VERT) ? CORNER_OFFSET : 0); + const double span = _span - off; + double fract = (delta / span); fract = min (1.0, fract); fract = max (-1.0, fract); @@ -556,7 +573,7 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) fract = -fract; } - adjustment.set_value (adjustment.get_value() + scale * fract * (adjustment.get_upper() - adjustment.get_lower())); + _adjustment.set_value (_adjustment.get_value() + scale * fract * (_adjustment.get_upper() - _adjustment.get_lower())); } return true; @@ -565,21 +582,23 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) void PixFader::adjustment_changed () { - if (display_span() != _last_drawn) { - queue_draw (); - } + queue_draw (); } /** @return pixel offset of the current value from the right or bottom of the fader */ int PixFader::display_span () { - float fract = (adjustment.get_value () - adjustment.get_lower()) / ((adjustment.get_upper() - adjustment.get_lower())); + float fract = (_adjustment.get_value () - _adjustment.get_lower()) / ((_adjustment.get_upper() - _adjustment.get_lower())); int ds; if (_orien == VERT) { - ds = (int)rint (_span * (1.0 - fract)); + const double off = FADER_RESERVE + CORNER_OFFSET; + const double span = _span - off; + ds = (int)rint (span * (1.0 - fract)); } else { - ds = (int)rint (_span * fract); + const double off = FADER_RESERVE; + const double span = _span - off; + ds = (int)rint (span * fract + off); } return ds; @@ -589,9 +608,11 @@ void PixFader::update_unity_position () { if (_orien == VERT) { - _unity_loc = (int) rint (_span * (1 - ((_default_value - adjustment.get_lower()) / (adjustment.get_upper() - adjustment.get_lower())))) - 1; + const double span = _span - FADER_RESERVE - CORNER_OFFSET; + _unity_loc = (int) rint (span * (1 - ((_default_value - _adjustment.get_lower()) / (_adjustment.get_upper() - _adjustment.get_lower())))) - 1; } else { - _unity_loc = (int) rint ((_default_value - adjustment.get_lower()) * _span / (adjustment.get_upper() - adjustment.get_lower())); + const double span = _span - FADER_RESERVE; + _unity_loc = (int) rint (FADER_RESERVE + (_default_value - _adjustment.get_lower()) * span / (_adjustment.get_upper() - _adjustment.get_lower())); } queue_draw (); @@ -601,7 +622,9 @@ bool PixFader::on_enter_notify_event (GdkEventCrossing*) { _hovering = true; - Keyboard::magic_widget_grab_focus (); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_grab_focus (); + } queue_draw (); return false; } @@ -611,7 +634,9 @@ PixFader::on_leave_notify_event (GdkEventCrossing*) { if (!_dragging) { _hovering = false; - Keyboard::magic_widget_drop_focus(); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_drop_focus(); + } queue_draw (); } return false; @@ -620,12 +645,14 @@ PixFader::on_leave_notify_event (GdkEventCrossing*) void PixFader::set_adjustment_from_event (GdkEventButton* ev) { - double fract = (_orien == VERT) ? (1.0 - (ev->y / _span)) : (ev->x / _span); + const double off = FADER_RESERVE + ((_orien == VERT) ? CORNER_OFFSET : 0); + const double span = _span - off; + double fract = (_orien == VERT) ? (1.0 - ((ev->y - off) / span)) : ((ev->x - off) / span); fract = min (1.0, fract); fract = max (0.0, fract); - adjustment.set_value (fract * (adjustment.get_upper () - adjustment.get_lower ())); + _adjustment.set_value (fract * (_adjustment.get_upper () - _adjustment.get_lower ())); } void @@ -636,11 +663,16 @@ PixFader::set_default_value (float d) } void -PixFader::show_unity_line (bool yn ) +PixFader::set_tweaks (Tweaks t) { - if (yn == _display_unity_line) return; - _display_unity_line = yn; - queue_draw(); + bool need_redraw = false; + if ((_tweaks & NoShowUnityLine) ^ (t & NoShowUnityLine)) { + need_redraw = true; + } + _tweaks = t; + if (need_redraw) { + queue_draw(); + } } void @@ -680,7 +712,7 @@ PixFader::on_style_changed (const Glib::RefPtr&) _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 ();