pay some attention to the special guest of the night: KDE window stacking

[ardour.git] / gtk2_ardour / ardour_dropdown.cc

diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc
index 29efe34da35fa7e2e19ba9336063d9623c443c77..6c527f2d27b356721bbc7cd71ab5c51fa24ba5db 100644 (file)
--- a/gtk2_ardour/ardour_dropdown.cc
+++ b/gtk2_ardour/ardour_dropdown.cc
@@ -34,10 +34,8 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_dropdown.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define REFLECTION_HEIGHT 2
 
@@ -45,14 +43,16 @@ using namespace Gdk;
 using namespace Gtk;
 using namespace Glib;
 using namespace PBD;
-using std::max;
-using std::min;
 using namespace std;
 
 
 ArdourDropdown::ArdourDropdown (Element e)
+       : _scrolling_disabled(false)
 {
 //     signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourDropdown::on_mouse_pressed));
+       _menu.signal_size_request().connect (sigc::mem_fun(*this, &ArdourDropdown::menu_size_request));
+
+       _menu.set_reserve_toggle_size(false);
 
        add_elements(e);
        add_elements(ArdourButton::Menu);
@@ -62,11 +62,16 @@ ArdourDropdown::~ArdourDropdown ()
 {
 }
 
+void
+ArdourDropdown::menu_size_request(Requisition *req) {
+       req->width = max(req->width, get_allocation().get_width());
+}
+
 bool
 ArdourDropdown::on_button_press_event (GdkEventButton* ev)
 {
        if (ev->type == GDK_BUTTON_PRESS) {
-               _menu.popup (1, gtk_get_current_event_time());
+               Gtkmm2ext::anchored_menu_popup(&_menu, this, get_text(), 1, ev->time);
        }
        return true;
 }
@@ -76,6 +81,10 @@ 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;
@@ -140,8 +149,12 @@ 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;
+}