FIX: Mac image preview only shows spinner

gkngkc · Oct 16, 2017 · 636db99 · 636db99
1 parent e7890e7
commit 636db99
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 32 deletions.
diff --git a/...loneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser b/...loneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser
diff --git a/...ileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta b/...ileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta
diff --git a/Package/StandaloneFileBrowser.unitypackage b/Package/StandaloneFileBrowser.unitypackage
diff --git a/Plugins/MacOS/StandaloneFileBrowser/Plugin.mm b/Plugins/MacOS/StandaloneFileBrowser/Plugin.mm
@@ -129,22 +129,16 @@ - (void)dialogOpenFilePanelAsync:(NSString*)title
                                    multiselect:multiselect
                                 canChooseFiles:canChooseFiles
                               canChooseFolders:canChooseFolders];
-    if (panel) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([panel runModal] == NSModalResponseOK) {
-                if ([[panel URLs] count] > 0) {
-                    NSString* seperator = [NSString stringWithFormat:@"%c", 28];
-                    NSString* paths = [[panel URLs] componentsJoinedByString:seperator];
-                    asyncCallback([paths UTF8String]);
-                    return;
-                }
-            }
-            asyncCallback([@"" UTF8String]);
-        });
-    }
-    else {
-        asyncCallback([@"" UTF8String]);
+    [self performSelectorOnMainThread:@selector(dialogOpenFilePanelAsyncSelector:) withObject:panel waitUntilDone:NO];
+}
+
+- (void)dialogOpenFilePanelAsyncSelector:(NSOpenPanel*)panel {
+    NSString* paths = @"";
+    if (panel && [panel runModal] == NSModalResponseOK && [[panel URLs] count] > 0) {
+        NSString* seperator = [NSString stringWithFormat:@"%c", 28];
+        paths = [[panel URLs] componentsJoinedByString:seperator];
     }
+    asyncCallback([paths UTF8String]);
 }
 
 - (NSOpenPanel*)createOpenPanel:(NSString*)title
@@ -229,23 +223,19 @@ - (void)dialogSaveFilePanelAsync:(NSString*)title
                                      directory:directory
                                    defaultName:defaultName
                                        filters:filters];
-    if (panel) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if ([panel runModal] == NSModalResponseOK) {
-                NSURL *URL = [panel URL];
-                if (URL) {
-                    asyncCallback([[URL path] UTF8String]);
-                    return;
-                }
-            }
-            asyncCallback([@"" UTF8String]);
-        });
-    }
-    else {
-        asyncCallback([@"" UTF8String]);
-    }
+    [self performSelectorOnMainThread:@selector(dialogSaveFilePanelAsyncSelector:) withObject:panel waitUntilDone:NO];
 }
 
+- (void)dialogSaveFilePanelAsyncSelector:(NSSavePanel*)panel {
+    NSString* path = @"";
+    if (panel && [panel runModal] == NSModalResponseOK) {
+        NSURL *URL = [panel URL];
+        if (URL) {
+            path = [URL path];
+        }
+    }
+    asyncCallback([path UTF8String]);
+}
 
 - (NSSavePanel*)createSavePanel:(NSString*)title
                       directory:(NSString*)directory

diff --git a/Plugins/MacOS/StandaloneFileBrowser/Plugin.pch b/Plugins/MacOS/StandaloneFileBrowser/Plugin.pch
@@ -49,11 +49,15 @@ extern "C" {
                   canChooseFiles:(BOOL)canChooseFiles
                 canChooseFolders:(BOOL)canChooseFolders;
 
+- (void)dialogOpenFilePanelAsyncSelector:(NSOpenPanel*)panel;
+
 - (void)dialogSaveFilePanelAsync:(NSString*)title
                        directory:(NSString*)directory
                      defaultName:(NSString*)defaultName
                          filters:(NSString*)filters;
 
+- (void)dialogSaveFilePanelAsyncSelector:(NSOpenPanel*)panel;
+
 - (NSOpenPanel*)createOpenPanel:(NSString*)title
                       directory:(NSString*)directory
                         filters:(NSString*)filters

diff --git a/...roj/project.xcworkspace/xcuserdata/gokhangokce.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/gokhangokce.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
+m_EditorVersion: 2017.1.0f3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2017.1.1f1
		m_EditorVersion: 2017.1.0f3