graphics_view: fix drag and drop

JoepVanlier · Jul 9, 2024 · 2c171ba · 2c171ba
1 parent 72fb5b7
commit 2c171ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/plugin/components/graphics_view.cpp b/plugin/components/graphics_view.cpp
@@ -30,8 +30,7 @@
 #include <cmath>
 #include <cstdio>
 
-struct YsfxGraphicsView::Impl final : public better::AsyncUpdater::Listener,
-                                      public juce::FileDragAndDropTarget {
+struct YsfxGraphicsView::Impl final : public better::AsyncUpdater::Listener {
     static uint32_t translateKeyCode(int code);
     static uint32_t translateModifiers(juce::ModifierKeys mods);
     static void translateKeyPress(const juce::KeyPress &key, uint32_t &ykey, uint32_t &ymods);
@@ -106,10 +105,6 @@ struct YsfxGraphicsView::Impl final : public better::AsyncUpdater::Listener,
     juce::StringArray m_droppedFiles;
     juce::String m_droppedFileReturned;
 
-    // FileDragAndDropTarget implementation
-    bool isInterestedInFileDrag(const juce::StringArray &files) override;
-    void filesDropped(const juce::StringArray &files, int x, int y) override;
-
     //--------------------------------------------------------------------------
     // The background thread will trigger these async updates.
 
@@ -874,18 +869,18 @@ void YsfxGraphicsView::Impl::endPopupMenu(int menuResult)
 }
 
 //------------------------------------------------------------------------------
-bool YsfxGraphicsView::Impl::isInterestedInFileDrag(const juce::StringArray &files)
+bool YsfxGraphicsView::isInterestedInFileDrag(const juce::StringArray &files)
 {
     (void)files;
     return true;
 }
 
-void YsfxGraphicsView::Impl::filesDropped(const juce::StringArray &files, int x, int y)
+void YsfxGraphicsView::filesDropped(const juce::StringArray &files, int x, int y)
 {
     (void)x;
     (void)y;
-    std::lock_guard<std::mutex> lock{m_droppedFilesMutex};
-    m_droppedFiles = files;
+    std::lock_guard<std::mutex> lock{m_impl->m_droppedFilesMutex};
+    m_impl->m_droppedFiles = files;
 }
 
 //------------------------------------------------------------------------------

diff --git a/plugin/components/graphics_view.h b/plugin/components/graphics_view.h
@@ -20,7 +20,7 @@
 #include <juce_gui_basics/juce_gui_basics.h>
 #include <memory>
 
-class YsfxGraphicsView : public juce::Component {
+class YsfxGraphicsView : public juce::Component, public juce::FileDragAndDropTarget {
 public:
     YsfxGraphicsView();
     ~YsfxGraphicsView() override;
@@ -37,6 +37,10 @@ class YsfxGraphicsView : public juce::Component {
     void mouseUp(const juce::MouseEvent &event) override;
     void mouseWheelMove(const juce::MouseEvent &event, const juce::MouseWheelDetails &wheel) override;
 
+    // FileDragAndDropTarget implementation
+    bool isInterestedInFileDrag(const juce::StringArray &files) override;
+    void filesDropped(const juce::StringArray &files, int x, int y) override;
+
 private:
     float m_pixelFactor{1.0f};