diff options
| author | Robin Gareus <robin@gareus.org> | 2014-08-29 21:08:49 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-08-29 21:08:49 +0200 |
| commit | 78b9f65632d725dd35436a4ad1bc26b9eeecc32e (patch) | |
| tree | 018fbd80f7aa4d2c221fd42f46a77be220c6b913 /gtk2_ardour/ardour_button.cc | |
| parent | 083620beb898fc77fd231bbaccecfe9d6c104315 (diff) | |
explicit Button inactive state.
Ideally large parts of ArdourButton would become ArdourLabel,
which in turn is used by ArdourButton
Diffstat (limited to 'gtk2_ardour/ardour_button.cc')
| -rw-r--r-- | gtk2_ardour/ardour_button.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index fb07ecffe9..f353edab43 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -430,7 +430,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) } //user is currently pressing the button. black outline helps to indicate this - if ( _grabbed && !((_elements & Menu)==Menu) && _action) { + if ( _grabbed && !(_elements & (Inactive|Menu))) { cairo_set_line_width(cr,1); rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1); cairo_set_source_rgba (cr, 0, 0, 0, 1.0); @@ -911,7 +911,7 @@ ArdourButton::on_key_release_event (GdkEventKey *ev) { bool ArdourButton::on_enter_notify_event (GdkEventCrossing* ev) { - _hovering = true; + _hovering = (_elements & Inactive) ? false : true; if (ARDOUR::Config->get_widget_prelight()) { queue_draw (); |