diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
| commit | b08d13706f9e98fc75a727822209942c00d8f1b3 (patch) | |
| tree | 4a6fd2881755a340cabcd4a79657f6bb682625de /gtk2_ardour/generic_pluginui.cc | |
| parent | 86a9d45ad072809c06e41e3c10683f0f0ee6a4a6 (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/generic_pluginui.cc')
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index f7110740ee..52e583a4f8 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -127,11 +127,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, boost::weak_ptr<Processor>(pi)), gui_context()); - if (!pi->active()) { - bypass_button.set_active_state (Gtkmm2ext::Active); - } else { - bypass_button.unset_active_state (); - } + bypass_button.set_active (!pi->active()); prefheight = 0; build (); @@ -443,9 +439,8 @@ GenericPluginUI::automation_state_changed (ControlUI* cui) // don't lock to avoid deadlock because we're triggered by // AutomationControl::Changed() while the automation lock is taken - switch (insert->get_parameter_automation_state (cui->parameter()) - & (Off|Play|Touch|Write)) { - case Off: + switch (insert->get_parameter_automation_state (cui->parameter()) & (ARDOUR::Off|Play|Touch|Write)) { + case ARDOUR::Off: cui->automate_button.set_label (S_("Automation|Manual")); break; case Play: @@ -698,7 +693,7 @@ GenericPluginUI::astate_clicked (ControlUI* cui, uint32_t /*port*/) items.clear (); items.push_back (MenuElem (S_("Automation|Manual"), - sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Off, cui))); + sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) ARDOUR::Off, cui))); items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Play, cui))); items.push_back (MenuElem (_("Write"), |