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/ardour_ui.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/ardour_ui.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fbec7212ea..306d0c2482 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1929,7 +1929,7 @@ ARDOUR_UI::map_transport_state () auto_loop_button.unset_active_state (); play_selection_button.unset_active_state (); roll_button.unset_active_state (); - stop_button.set_active_state (Gtkmm2ext::Active); + stop_button.set_active_state (Gtkmm2ext::ExplicitActive); return; } @@ -1943,37 +1943,37 @@ ARDOUR_UI::map_transport_state () if (_session->get_play_range()) { - play_selection_button.set_active_state (Gtkmm2ext::Active); + play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive); roll_button.unset_active_state (); auto_loop_button.unset_active_state (); } else if (_session->get_play_loop ()) { - auto_loop_button.set_active_state (Gtkmm2ext::Active); - play_selection_button.unset_active_state (); - roll_button.unset_active_state (); + auto_loop_button.set_active (true); + play_selection_button.set_active (false); + roll_button.set_active (false); } else { - roll_button.set_active_state (Gtkmm2ext::Active); - play_selection_button.unset_active_state (); - auto_loop_button.unset_active_state (); + roll_button.set_active (true); + play_selection_button.set_active (false); + auto_loop_button.set_active (false); } if (Config->get_always_play_range()) { /* light up both roll and play-selection if they are joined */ - roll_button.set_active_state (Gtkmm2ext::Active); - play_selection_button.set_active_state (Gtkmm2ext::Active); + roll_button.set_active (true); + play_selection_button.set_active (true); } - stop_button.unset_active_state (); + stop_button.set_active (false); } else { - stop_button.set_active_state (Gtkmm2ext::Active); - roll_button.unset_active_state (); - play_selection_button.unset_active_state (); - auto_loop_button.unset_active_state (); + stop_button.set_active (true); + roll_button.set_active (false); + play_selection_button.set_active (false); + auto_loop_button.set_active (false); update_disk_space (); } } @@ -2384,12 +2384,12 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff) if (r == Session::Enabled || (r == Session::Recording && !h)) { if (onoff) { - rec_button.set_active_state (Active); + rec_button.set_active_state (Gtkmm2ext::ExplicitActive); } else { - rec_button.set_active_state (Mid); + rec_button.set_active_state (Gtkmm2ext::ImplicitActive); } } else if (r == Session::Recording && h) { - rec_button.set_active_state (Mid); + rec_button.set_active_state (Gtkmm2ext::ImplicitActive); } else { rec_button.unset_active_state (); } @@ -3600,7 +3600,7 @@ ARDOUR_UI::step_edit_status_change (bool yn) // we make insensitive if (yn) { - rec_button.set_active_state (Mid); + rec_button.set_active_state (Gtkmm2ext::ImplicitActive); rec_button.set_sensitive (false); } else { rec_button.unset_active_state ();; |