Bring back contrained drag modifier with preference setting.

[ardour.git] / gtk2_ardour / ardour_dropdown.cc

diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc
index 3e214ef9e89aa21b36d8072c6e503a8d60e5eb82..6ad1f7c11e2128b839a51306b872fb8d42d6bb6b 100644 (file)
--- a/gtk2_ardour/ardour_dropdown.cc
+++ b/gtk2_ardour/ardour_dropdown.cc
@@ -52,7 +52,7 @@ using namespace std;
 
 ArdourDropdown::ArdourDropdown (Element e)
 {
-       signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourDropdown::on_mouse_pressed));
+//     signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourDropdown::on_mouse_pressed));
 
        add_elements(e);
        add_elements(ArdourButton::Menu);
@@ -63,12 +63,76 @@ ArdourDropdown::~ArdourDropdown ()
 }
 
 bool
-ArdourDropdown::on_mouse_pressed (GdkEventButton*)
+ArdourDropdown::on_button_press_event (GdkEventButton* ev)
 {
-       _menu.popup (1, gtk_get_current_event_time());  
+       if (ev->type == GDK_BUTTON_PRESS) {
+               _menu.popup (1, gtk_get_current_event_time());
+       }
        return true;
 }
 
+bool
+ArdourDropdown::on_scroll_event (GdkEventScroll* ev)
+{
+       using namespace Menu_Helpers;
+
+       const MenuItem * current_active = _menu.get_active();
+       const MenuList& items = _menu.items ();
+       int c = 0;
+
+       if (!current_active) {
+               return true;
+       }
+
+       /* work around another gtkmm API clusterfuck
+        * const MenuItem* get_active () const
+        * void set_active (guint index)
+        *
+        * also MenuList.activate_item does not actually
+        * set it as active in the menu.
+        *
+        */
+
+       switch (ev->direction) {
+               case GDK_SCROLL_UP:
+
+                       for (MenuList::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i, ++c) {
+                               if ( &(*i) != current_active) {
+                                       continue;
+                               }
+                               if (++i != items.rend()) {
+                                       c = items.size() - 2 - c;
+                                       assert(c >= 0);
+                                       _menu.set_active(c);
+                                       _menu.activate_item(*i);
+                               }
+                               break;
+                       }
+                       break;
+               case GDK_SCROLL_DOWN:
+                       for (MenuList::const_iterator i = items.begin(); i != items.end(); ++i, ++c) {
+                               if ( &(*i) != current_active) {
+                                       continue;
+                               }
+                               if (++i != items.end()) {
+                                       assert(c + 1 < (int) items.size());
+                                       _menu.set_active(c + 1);
+                                       _menu.activate_item(*i);
+                               }
+                               break;
+                       }
+                       break;
+               default:
+                       break;
+       }
+       return true;
+}
+
+void
+ArdourDropdown::clear_items ()
+{
+       _menu.items ().clear ();
+}
 
 void
 ArdourDropdown::AddMenuElem (Menu_Helpers::MenuElem e)