Fix up confusion with relayering after movement drags in

[ardour.git] / gtk2_ardour / midi_channel_selector.h

diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 42c3d55045a2ac3abe1dbe642ff2c7d4534ec337..c5e6a5a3783d0d81eee10fb1107367d7539081ae 100644 (file)
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -23,12 +23,13 @@
 #include <set>
 #include "boost/shared_ptr.hpp"
 #include "sigc++/trackable.h"
+
 #include "gtkmm/table.h"
 #include "gtkmm/button.h"
-#include "gtkmm/togglebutton.h"
 #include "gtkmm/label.h"
-#include "ardour/types.h"
+#include "gtkmm2ext/stateful_button.h"
 
+#include "ardour/types.h"
 
 class MidiChannelSelector : public Gtk::Table
 {
@@ -36,7 +37,7 @@ public:
        MidiChannelSelector(int n_rows = 4, int n_columns = 4, int start_row = 0, int start_column = 0);
        virtual ~MidiChannelSelector() = 0;
 
-       sigc::signal<void, ARDOUR::ChannelMode, uint16_t> mode_changed;
+       sigc::signal<void> clicked;
 
        void set_channel_colors(const uint32_t new_channel_colors[16]);
        void set_default_channel_color();
@@ -44,8 +45,9 @@ public:
 protected:
        virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
        Gtk::Label        _button_labels[4][4];
-       Gtk::ToggleButton _buttons[4][4];
+       Gtkmm2ext::StatefulToggleButton _buttons[4][4];
        int               _recursion_counter;
+        bool              was_clicked (GdkEventButton*);
 };
 
 class SingleMidiChannelSelector : public MidiChannelSelector
@@ -72,6 +74,12 @@ public:
 
        virtual ~MidiMultipleChannelSelector();
 
+       /** The channel mode or selected channel(s) has changed.
+        *  First parameter is the new channel mode, second parameter is a bitmask
+        *  of the currently selected channels.
+        */
+       sigc::signal<void, ARDOUR::ChannelMode, uint16_t> mode_changed;
+
        void set_channel_mode(ARDOUR::ChannelMode mode, uint16_t mask);
 
        /**