X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dropdown.cc;h=5c0e25fd2459b280257df469fc92a7f5737cb6a0;hb=62937ea1a658786f7615258bfe77af096c73123b;hp=3e214ef9e89aa21b36d8072c6e503a8d60e5eb82;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc
index 3e214ef9e8..5c0e25fd24 100644
--- a/gtk2_ardour/ardour_dropdown.cc
+++ b/gtk2_ardour/ardour_dropdown.cc
@@ -34,8 +34,6 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_dropdown.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
 
 #include "i18n.h"
 
@@ -51,8 +49,9 @@ using namespace std;
 
 
 ArdourDropdown::ArdourDropdown (Element e)
+	: _scrolling_disabled(false)
 {
-	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,21 +62,93 @@ 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;
+
+	if (_scrolling_disabled) {
+		return false;
+	}
+
+	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::AddMenuElem (Menu_Helpers::MenuElem e)
+ArdourDropdown::clear_items ()
+{
+	_menu.items ().clear ();
+}
+
+void
+ArdourDropdown::AddMenuElem (Menu_Helpers::Element e)
 {
 	using namespace Menu_Helpers;
 
 	MenuList& items = _menu.items ();
-	
+
 	items.push_back (e);
 }
 
-
+void
+ArdourDropdown::disable_scrolling()
+{
+	_scrolling_disabled = true;
+}