mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

PopupMenu: Make dismissOnMouseUp private

Browse source
This commit is contained in:
reuk 2024-10-16 13:05:14 +01:00
parent 570b86ff0c
commit db4a2c0b9f
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_gui_basics/menus/juce_PopupMenu.cpp
View file

@ -345,11 +345,11 @@ struct MenuWindow final : public Component
options (opts.withParentComponent (findNonNullLookAndFeel (menu, parentWindow).getParentComponentForMenuOptions (opts))),
managerOfChosenCommand (manager),
componentAttachedTo (options.getTargetComponent()),
dismissOnMouseUp (shouldDismissOnMouseUp),
windowCreationTime (Time::getMillisecondCounter()),
lastFocusedTime (windowCreationTime),
timeEnteredCurrentChildComp (windowCreationTime),
scaleFactor (parentWindow != nullptr ? parentScaleFactor : 1.0f)
scaleFactor (parentWindow != nullptr ? parentScaleFactor : 1.0f),
dismissOnMouseUp (shouldDismissOnMouseUp)
{
setWantsKeyboardFocus (false);
setMouseClickGrabsKeyboardFocus (false);
@ -1311,6 +1311,7 @@ struct MenuWindow final : public Component
}
bool mouseHasBeenOver() const { return mouseWasOver; }
bool shouldDismissOnMouseUp() const { return dismissOnMouseUp; }
//==============================================================================
MenuWindow* parent;
@ -1320,7 +1321,7 @@ struct MenuWindow final : public Component
WeakReference<Component> componentAttachedTo;
Rectangle<int> windowPos;
bool needsToScroll = false;
bool dismissOnMouseUp, hideOnExit = false, disableMouseMoves = false, hasAnyJuceCompHadFocus = false;
bool hideOnExit = false, disableMouseMoves = false, hasAnyJuceCompHadFocus = false;
int numColumns = 0, contentHeight = 0, childYOffset = 0;
Component::SafePointer<ItemComponent> currentChild;
std::unique_ptr<MenuWindow> activeSubMenu;
@ -1338,6 +1339,7 @@ private:
}
bool mouseWasOver = false;
bool dismissOnMouseUp = false;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MenuWindow)
};
@ -1434,7 +1436,7 @@ private:
{
if (reallyContained)
window.triggerCurrentlyHighlightedItem();
else if ((window.mouseHasBeenOver() || ! window.dismissOnMouseUp) && ! isOverAny)
else if ((window.mouseHasBeenOver() || ! window.shouldDismissOnMouseUp()) && ! isOverAny)
window.dismissMenu (nullptr);
// Note: This object may have been deleted by the previous call.