修正在 macOS 10.13 beta 上無法叫出偏好設定的問題

修正根據請參考以下連結: openvanilla/openvanilla@3241c7f
openvanilla · Sep 5, 2017 · 3267a91 · 3267a91
1 parent 4cf379b
commit 3267a91
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h
@@ -34,6 +34,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+@class PreferencesWindowController;
 @class UpdateNotificationController;
 
 @interface AppDelegate : NSObject <NSApplicationDelegate>
@@ -42,11 +43,13 @@
     NSWindow *_window;
     NSURLConnection *_updateCheckConnection;
     NSMutableData *_receivingData;
+    PreferencesWindowController *_preferencesWindowController;
     UpdateNotificationController *_updateNotificationController;
 }
 
 - (void)checkForUpdate;
 - (void)checkForUpdateForced:(BOOL)forced;
+- (void)showPreferences;
 
 @property (assign, nonatomic) IBOutlet NSWindow *window;
 @end
diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m
@@ -52,6 +52,7 @@ @implementation AppDelegate
 
 - (void)dealloc
 {
+    [_preferencesWindowController release];
     [_updateCheckConnection release];
     [_updateNotificationController release];
     [super dealloc];
@@ -122,6 +123,15 @@ - (void)checkForUpdateForced:(BOOL)forced
     [_updateCheckConnection start];
 }
 
+- (void)showPreferences
+{
+    if (!_preferencesWindowController) {
+        _preferencesWindowController = [[PreferencesWindowController alloc] initWithWindowNibName:@"preferences"];
+    }
+    [[_preferencesWindowController window] center];
+    [[_preferencesWindowController window] orderFront:self];
+}
+
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
 {
     [_receivingData release];

diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm
@@ -1385,7 +1385,11 @@ - (void)_showCandidateWindowUsingVerticalMode:(BOOL)useVerticalMode client:(id)c
 - (void)showPreferences:(id)sender
 {
     // show the preferences panel, and also make the IME app itself the focus
-    [super showPreferences:sender];
+    if ([IMKInputController instancesRespondToSelector:@selector(showPreferences:)]) {
+        [super showPreferences:sender];
+    } else {
+        [(AppDelegate *)[NSApp delegate] showPreferences];
+    }
     [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
 }