Browse Source

Added sourceDetails parameter to dragOperationStarted and dragOperationEnded

tags/2021-05-28
hogliux 9 years ago
parent
commit
0df1e0b5a9
2 changed files with 8 additions and 6 deletions
  1. +4
    -4
      modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
  2. +4
    -2
      modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h

+ 4
- 4
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp View File

@@ -70,7 +70,7 @@ public:
current->itemDragExit (sourceDetails);
}
owner.dragOperationEnded();
owner.dragOperationEnded (sourceDetails);
}
void paint (Graphics& g) override
@@ -469,7 +469,7 @@ void DragAndDropContainer::startDragging (const var& sourceDescription,
peer->performAnyPendingRepaintsNow();
#endif
dragOperationStarted();
dragOperationStarted (dragImageComponent->sourceDetails);
}
}
@@ -500,8 +500,8 @@ bool DragAndDropContainer::shouldDropFilesWhenDraggedExternally (const DragAndDr
return false;
}
void DragAndDropContainer::dragOperationStarted() {}
void DragAndDropContainer::dragOperationEnded() {}
void DragAndDropContainer::dragOperationStarted (const DragAndDropTarget::SourceDetails&) {}
void DragAndDropContainer::dragOperationEnded (const DragAndDropTarget::SourceDetails&) {}
//==============================================================================
DragAndDropTarget::SourceDetails::SourceDetails (const var& desc, Component* comp, Point<int> pos) noexcept


+ 4
- 2
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h View File

@@ -169,10 +169,10 @@ protected:
StringArray& files, bool& canMoveFiles);
/** Subclasses can override this to be told when a drag starts. */
virtual void dragOperationStarted();
virtual void dragOperationStarted (const DragAndDropTarget::SourceDetails& sourceDetails);
/** Subclasses can override this to be told when a drag finishes. */
virtual void dragOperationEnded();
virtual void dragOperationEnded (const DragAndDropTarget::SourceDetails& sourceDetails);
private:
//==============================================================================
@@ -181,6 +181,8 @@ private:
friend struct ContainerDeletePolicy<DragImageComponent>;
ScopedPointer<DragImageComponent> dragImageComponent;
JUCE_DEPRECATED_WITH_BODY (virtual void dragOperationStarted (), {});
JUCE_DEPRECATED_WITH_BODY (virtual void dragOperationEnded (), {});
JUCE_DEPRECATED_WITH_BODY (virtual bool shouldDropFilesWhenDraggedExternally (const String&, Component*, StringArray&, bool&), { return false; })
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DragAndDropContainer)


Loading…
Cancel
Save