From fdc77e645d88fd85b38fd579a6824f268d1bacc5 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 3 Dec 2018 14:21:51 +0000 Subject: [PATCH] Windows: Fixed a focus ping-pong issue in the native file chooser when using a custom component --- modules/juce_gui_basics/native/juce_win32_FileChooser.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp index 417fd76568..a7ac49cedf 100644 --- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp +++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp @@ -120,6 +120,8 @@ public: EndDialog (hwnd, 0); } + Component* getCustomComponent() { return customComponent.get(); } + Array results; private: @@ -567,6 +569,9 @@ public: if (targetComponent == nullptr) return false; + if (targetComponent == nativeFileChooser->getCustomComponent()) + return true; + return targetComponent->findParentComponentOfClass() != nullptr; }