From 79d26045bbca815c94b1ea9a464d77c1bb493c38 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 15 May 2013 11:15:17 -0600 Subject: [PATCH] PopupMenu header ID fix. --- .../juce_gui_basics/menus/juce_PopupMenu.cpp | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 07485ecd99..b217e60800 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -23,6 +23,18 @@ ============================================================================== */ +//============================================================================== +namespace PopupMenuSettings +{ + const int scrollZone = 24; + const int borderSize = 2; + const int timerInterval = 50; + const int dismissCommandId = 0x6287345f; + const int sectionHeaderID = 0x4734a34f; + + static bool menuWasHiddenBecauseOfAppChange = false; +} + class PopupMenu::Item { public: @@ -87,7 +99,7 @@ public: commandManager (other.commandManager) {} - bool canBeTriggered() const noexcept { return isActive && itemID != 0; } + bool canBeTriggered() const noexcept { return isActive && itemID != 0 && itemID != PopupMenuSettings::sectionHeaderID; } bool hasActiveSubMenu() const noexcept { return isActive && subMenu != nullptr && subMenu->items.size() > 0; } //============================================================================== @@ -199,17 +211,6 @@ private: }; -//============================================================================== -namespace PopupMenuSettings -{ - const int scrollZone = 24; - const int borderSize = 2; - const int timerInterval = 50; - const int dismissCommandId = 0x6287345f; - - static bool menuWasHiddenBecauseOfAppChange = false; -} - //============================================================================== class PopupMenu::Window : public Component, private Timer @@ -1330,7 +1331,7 @@ private: void PopupMenu::addSectionHeader (const String& title) { - addCustomItem (0X4734a34f, new HeaderItemComponent (title)); + addCustomItem (PopupMenuSettings::sectionHeaderID, new HeaderItemComponent (title)); } //==============================================================================