summaryrefslogtreecommitdiff
path: root/gtk2_ardour/button_joiner.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-02-07 17:43:55 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-02-07 17:43:55 +0000
commitb08d13706f9e98fc75a727822209942c00d8f1b3 (patch)
tree4a6fd2881755a340cabcd4a79657f6bb682625de /gtk2_ardour/button_joiner.cc
parent86a9d45ad072809c06e41e3c10683f0f0ee6a4a6 (diff)
remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/button_joiner.cc')
-rw-r--r--gtk2_ardour/button_joiner.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc
index 8df5e1fc4b..fffe874f03 100644
--- a/gtk2_ardour/button_joiner.cc
+++ b/gtk2_ardour/button_joiner.cc
@@ -67,7 +67,7 @@ ButtonJoiner::render (cairo_t* cr)
{
double h = get_height();
- if (_active_state == Gtkmm2ext::ActiveState (0)) {
+ if (!get_active()) {
cairo_set_source (cr, inactive_fill_pattern);
} else {
cairo_set_source (cr, active_fill_pattern);
@@ -169,11 +169,7 @@ ButtonJoiner::action_toggled ()
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
if (tact) {
- if (tact->get_active()) {
- set_active_state (Gtkmm2ext::Active);
- } else {
- unset_active_state ();
- }
+ set_active (tact->get_active());
}
}