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

Tweaked OS file drag-and-drop to ignore unwanted file types. Minor structural fixes. Changes to avoid cancellation of ThreadWithAlertWindow and for Linux openGL rendering.

Browse source
This commit is contained in:
Julian Storer 2011-07-01 11:40:44 +01:00
parent a06e8336e5
commit 3871c8d6d1
25 changed files with 460 additions and 508 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/gui/components/windows/juce_ComponentPeer.cpp
View file

@ -435,7 +435,7 @@ namespace ComponentPeerHelpers
}
}
void ComponentPeer::handleFileDragMove (const StringArray& files, const Point<int>& position)
bool ComponentPeer::handleFileDragMove (const StringArray& files, const Point<int>& position)
{
updateCurrentModifiers();
@ -471,21 +471,22 @@ void ComponentPeer::handleFileDragMove (const StringArray& files, const Point<in
newTarget = lastTarget;
}
if (newTarget != nullptr)
{
Component* const targetComp = dynamic_cast <Component*> (newTarget);
const Point<int> pos (targetComp->getLocalPoint (component, position));
if (newTarget == nullptr)
return false;
newTarget->fileDragMove (files, pos.getX(), pos.getY());
}
Component* const targetComp = dynamic_cast <Component*> (newTarget);
const Point<int> pos (targetComp->getLocalPoint (component, position));
newTarget->fileDragMove (files, pos.getX(), pos.getY());
return true;
}
void ComponentPeer::handleFileDragExit (const StringArray& files)
bool ComponentPeer::handleFileDragExit (const StringArray& files)
{
handleFileDragMove (files, Point<int> (-1, -1));
const bool used = handleFileDragMove (files, Point<int> (-1, -1));
jassert (dragAndDropTargetComponent == nullptr);
lastDragAndDropCompUnderMouse = nullptr;
return used;
}
// We'll use an async message to deliver the drop, because if the target decides
@ -514,7 +515,7 @@ private:
JUCE_DECLARE_NON_COPYABLE (AsyncFileDropMessage);
};
void ComponentPeer::handleFileDragDrop (const StringArray& files, const Point<int>& position)
bool ComponentPeer::handleFileDragDrop (const StringArray& files, const Point<int>& position)
{
handleFileDragMove (files, position);
@ -535,12 +536,15 @@ void ComponentPeer::handleFileDragDrop (const StringArray& files, const Point<in
targetComp->internalModalInputAttempt();
if (targetComp->isCurrentlyBlockedByAnotherModalComponent())
return;
return true;
}
(new AsyncFileDropMessage (targetComp, target, targetComp->getLocalPoint (component, position), files))->post();
return true;
}
}
return false;
}
//==============================================================================