Browse Source

Added an 'includeChildren' parameter to Component::isMouseOverOrDragging

tags/2021-05-28
jules 9 years ago
parent
commit
92bb5e8b74
2 changed files with 7 additions and 3 deletions
  1. +6
    -2
      modules/juce_gui_basics/components/juce_Component.cpp
  2. +1
    -1
      modules/juce_gui_basics/components/juce_Component.h

+ 6
- 2
modules/juce_gui_basics/components/juce_Component.cpp View File

@@ -2969,14 +2969,18 @@ bool Component::isMouseButtonDown() const
return false;
}
bool Component::isMouseOverOrDragging() const
bool Component::isMouseOverOrDragging (const bool includeChildren) const
{
const Array<MouseInputSource>& mouseSources = Desktop::getInstance().getMouseSources();
for (MouseInputSource* mi = mouseSources.begin(), * const e = mouseSources.end(); mi != e; ++mi)
if (mi->getComponentUnderMouse() == this
{
Component* const c = mi->getComponentUnderMouse();
if ((c == this || (includeChildren && isParentOf (c)))
&& (mi->isMouse() || mi->isDragging()))
return true;
}
return false;
}


+ 1
- 1
modules/juce_gui_basics/components/juce_Component.h View File

@@ -1768,7 +1768,7 @@ public:
This is a handy equivalent to (isMouseOver() || isMouseButtonDown()).
@see isMouseOver, isMouseButtonDown, isMouseButtonDownAnywhere
*/
bool isMouseOverOrDragging() const;
bool isMouseOverOrDragging (bool includeChildren = false) const;
/** Returns true if a mouse button is currently down.


Loading…
Cancel
Save