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: Refactor mouseOver detection

Browse source 
The mouseWasOver member will now be updated on each mouse event, rather
than on a timer.
This commit is contained in:
reuk 2024-10-10 18:38:34 +01:00
parent 44a84e3a4d
commit 570b86ff0c
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -713,11 +713,6 @@ struct MenuWindow final : public Component
alterChildYPos (roundToInt (-10.0f * wheel.deltaY * PopupMenuSettings::scrollZone)); alterChildYPos (roundToInt (-10.0f * wheel.deltaY * PopupMenuSettings::scrollZone));
} }
void handleMouseEvent (const MouseEvent& e)
{
getMouseState (e.source).handleMouseEvent (e);
}
bool windowIsStillValid() bool windowIsStillValid()
{ {
if (! isVisible()) if (! isVisible())
@ -1315,6 +1310,8 @@ struct MenuWindow final : public Component
return getLookAndFeel(); return getLookAndFeel();
} }
bool mouseHasBeenOver() const { return mouseWasOver; }
//============================================================================== //==============================================================================
MenuWindow* parent; MenuWindow* parent;
const Options options; const Options options;
@ -1322,7 +1319,7 @@ struct MenuWindow final : public Component
ApplicationCommandManager** managerOfChosenCommand; ApplicationCommandManager** managerOfChosenCommand;
WeakReference<Component> componentAttachedTo; WeakReference<Component> componentAttachedTo;
Rectangle<int> windowPos; Rectangle<int> windowPos;
bool hasBeenOver = false, needsToScroll = false; bool needsToScroll = false;
bool dismissOnMouseUp, hideOnExit = false, disableMouseMoves = false, hasAnyJuceCompHadFocus = false; bool dismissOnMouseUp, hideOnExit = false, disableMouseMoves = false, hasAnyJuceCompHadFocus = false;
int numColumns = 0, contentHeight = 0, childYOffset = 0; int numColumns = 0, contentHeight = 0, childYOffset = 0;
Component::SafePointer<ItemComponent> currentChild; Component::SafePointer<ItemComponent> currentChild;
@ -1333,6 +1330,15 @@ struct MenuWindow final : public Component
float scaleFactor; float scaleFactor;
bool exitingModalState = false; bool exitingModalState = false;
private:
void handleMouseEvent (const MouseEvent& e)
{
mouseWasOver |= reallyContains (getLocalPoint (nullptr, e.getScreenPosition()), true);
getMouseState (e.source).handleMouseEvent (e);
}
bool mouseWasOver = false;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MenuWindow) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MenuWindow)
}; };
@ -1400,7 +1406,7 @@ private:
const bool overScrollArea = scrollIfNecessary (localMousePos, timeNow); const bool overScrollArea = scrollIfNecessary (localMousePos, timeNow);
const bool isOverAny = window.isOverAnyMenu(); const bool isOverAny = window.isOverAnyMenu();
if (window.hideOnExit && window.hasBeenOver && ! isOverAny) if (window.hideOnExit && window.mouseHasBeenOver() && ! isOverAny)
window.hide (nullptr, true); window.hide (nullptr, true);
else else
checkButtonState (localMousePos, timeNow, isDown, overScrollArea, isOverAny); checkButtonState (localMousePos, timeNow, isDown, overScrollArea, isOverAny);
@ -1409,7 +1415,7 @@ private:
void checkButtonState (Point<int> localMousePos, const uint32 timeNow, void checkButtonState (Point<int> localMousePos, const uint32 timeNow,
const bool wasDown, const bool overScrollArea, const bool isOverAny) const bool wasDown, const bool overScrollArea, const bool isOverAny)
{ {
isDown = window.hasBeenOver isDown = window.mouseHasBeenOver()
&& (ModifierKeys::currentModifiers.isAnyMouseButtonDown() && (ModifierKeys::currentModifiers.isAnyMouseButtonDown()
|| ComponentPeer::getCurrentModifiersRealtime().isAnyMouseButtonDown()); || ComponentPeer::getCurrentModifiersRealtime().isAnyMouseButtonDown());
@ -1428,7 +1434,7 @@ private:
{ {
if (reallyContained) if (reallyContained)
window.triggerCurrentlyHighlightedItem(); window.triggerCurrentlyHighlightedItem();
else if ((window.hasBeenOver || ! window.dismissOnMouseUp) && ! isOverAny) else if ((window.mouseHasBeenOver() || ! window.dismissOnMouseUp) && ! isOverAny)
window.dismissMenu (nullptr); window.dismissMenu (nullptr);
// Note: This object may have been deleted by the previous call. // Note: This object may have been deleted by the previous call.
@ -1445,9 +1451,6 @@ private:
{ {
const auto isMouseOver = window.reallyContains (localMousePos, true); const auto isMouseOver = window.reallyContains (localMousePos, true);
if (isMouseOver)
window.hasBeenOver = true;
if (lastMousePos.getDistanceFrom (globalMousePos) > 2) if (lastMousePos.getDistanceFrom (globalMousePos) > 2)
{ {
lastMouseMoveTime = timeNow; lastMouseMoveTime = timeNow;
@ -1484,7 +1487,7 @@ private:
if (! isMouseOver) if (! isMouseOver)
{ {
if (! window.hasBeenOver) if (! window.mouseHasBeenOver())
return; return;
itemUnderMouse = nullptr; itemUnderMouse = nullptr;