smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

catchup on previous commit relating to who owns ActiveState and VisualState

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10372 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-01 01:22:08 +00:00
parent 0fdb513786
commit 521937a9d1
9 changed files with 40 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/processor_box.cc
View file

@ -106,7 +106,7 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
_vbox.show ();
if (_processor->active()) {
_button.set_active_state (CairoWidget::Active);
_button.set_active_state (Gtkmm2ext::Active);
}
_button.set_diameter (3);
_button.set_distinct_led_click (true);
@ -147,23 +147,12 @@ ProcessorEntry::set_position (Position p)
}
void
ProcessorEntry::set_visual_state (Gtk::StateType t)
ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
{
/* map from GTK state to CairoWidget */
switch (t) {
case Gtk::STATE_ACTIVE:
_button.unset_visual_state ();
break;
case Gtk::STATE_SELECTED:
_button.set_visual_state (CairoWidget::Selected);
break;
case Gtk::STATE_NORMAL:
default:
_button.unset_visual_state ();
break;
if (yn) {
_button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
} else {
_button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
}
}
@ -201,7 +190,7 @@ ProcessorEntry::set_enum_width (Width w)
void
ProcessorEntry::led_clicked()
{
if (_button.active_state() == CairoWidget::Active) {
if (_button.active_state() == Gtkmm2ext::Active) {
_processor->deactivate ();
} else {
_processor->activate ();
@ -212,7 +201,7 @@ void
ProcessorEntry::processor_active_changed ()
{
if (_processor->active()) {
_button.set_active_state (CairoWidget::Active);
_button.set_active_state (Gtkmm2ext::Active);
} else {
_button.unset_active_state ();
}
@ -817,8 +806,6 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
bool
ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
{
cerr << "PBPE\n";
boost::shared_ptr<Processor> processor;
if (child) {
processor = child->processor ();