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

Fixed some toolbar customiser drag+drop problems.

Browse source
This commit is contained in:
jules 2013-07-25 18:14:23 +01:00
parent 072c27d7f4
commit 7590e3f1fe
11 changed files with 72 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
View file

@ -310,15 +310,13 @@ DragAndDropContainer::~DragAndDropContainer()
void DragAndDropContainer::startDragging (const var& sourceDescription,
Component* sourceComponent,
const Image& dragImage_,
Image dragImage,
const bool allowDraggingToExternalWindows,
const Point<int>* imageOffsetFromMouse)
{
Image dragImage (dragImage_);
if (dragImageComponent == nullptr)
{
MouseInputSource* draggingSource = Desktop::getInstance().getDraggingMouseSource (0);
MouseInputSource* const draggingSource = Desktop::getInstance().getDraggingMouseSource (0);
if (draggingSource == nullptr || ! draggingSource->isDragging())
{
@ -326,7 +324,7 @@ void DragAndDropContainer::startDragging (const var& sourceDescription,
return;
}
const Point<int> lastMouseDown (Desktop::getLastMouseDownPosition());
const Point<int> lastMouseDown (draggingSource->getLastMouseDownPosition());
Point<int> imageOffset;
if (dragImage.isNull())
@ -389,15 +387,15 @@ void DragAndDropContainer::startDragging (const var& sourceDescription,
}
else
{
Component* const thisComp = dynamic_cast <Component*> (this);
if (thisComp == nullptr)
if (Component* const thisComp = dynamic_cast <Component*> (this))
{
thisComp->addChildComponent (dragImageComponent);
}
else
{
jassertfalse; // Your DragAndDropContainer needs to be a Component!
return;
}
thisComp->addChildComponent (dragImageComponent);
}
static_cast <DragImageComponent*> (dragImageComponent.get())->updateLocation (false, lastMouseDown);

2
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
View file

@ -88,7 +88,7 @@ public:
*/
void startDragging (const var& sourceDescription,
Component* sourceComponent,
const Image& dragImage = Image::null,
Image dragImage = Image::null,
bool allowDraggingToOtherJuceWindows = false,
const Point<int>* imageOffsetFromMouse = nullptr);