mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-30 02:50:05 +00:00
Moved some mouse code out of Desktop class. Made the MouseInputSource class pass-by-value.
This commit is contained in:
parent
380a303adf
commit
be1d5253ee
22 changed files with 246 additions and 237 deletions
|
|
@ -367,14 +367,12 @@ private:
|
|||
|
||||
static bool isMouseDraggingInChildCompOf (Component* const comp)
|
||||
{
|
||||
const OwnedArray<MouseInputSource>& mouseSources = Desktop::getInstance().getMouseSources();
|
||||
const Array<MouseInputSource>& mouseSources = Desktop::getInstance().getMouseSources();
|
||||
|
||||
for (MouseInputSource** i = mouseSources.begin(), ** const e = mouseSources.end(); i != e; ++i)
|
||||
for (MouseInputSource* mi = mouseSources.begin(), * const e = mouseSources.end(); mi != e; ++mi)
|
||||
{
|
||||
MouseInputSource& source = **i;
|
||||
|
||||
if (source.isDragging())
|
||||
if (Component* const underMouse = source.getComponentUnderMouse())
|
||||
if (mi->isDragging())
|
||||
if (Component* const underMouse = mi->getComponentUnderMouse())
|
||||
if (comp == underMouse || comp->isParentOf (underMouse))
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue