Windows: Fixed a focus ping-pong issue in the native file chooser whe…

…n using a custom component
juce-framework · Dec 3, 2018 · fdc77e6 · fdc77e6
1 parent 6d2e17e
commit fdc77e6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
@@ -120,6 +120,8 @@ class Win32NativeFileChooser  : public ReferenceCountedObject,
             EndDialog (hwnd, 0);
     }
 
+    Component* getCustomComponent()    { return customComponent.get(); }
+
     Array<URL> results;
 
 private:
@@ -567,6 +569,9 @@ class FileChooser::Native     : public Component,
         if (targetComponent == nullptr)
             return false;
 
+        if (targetComponent == nativeFileChooser->getCustomComponent())
+            return true;
+
         return targetComponent->findParentComponentOfClass<FilePreviewComponent>() != nullptr;
     }