Managing shared UI properly

gershnik · Jan 10, 2024 · f0e0460 · f0e0460
1 parent 2b12536
commit f0e0460
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/Translit/src/AppDelegate.hpp b/Translit/src/AppDelegate.hpp
@@ -9,6 +9,9 @@
 
 @property (nonatomic, readonly) NSMenu * menu;
 
+-(void) displayMappingsForLanguage:(NSString *)language;
+-(void) setMappingsLanguage:(NSString *)language;
+
 @end
 
 #endif

diff --git a/Translit/src/AppDelegate.mm b/Translit/src/AppDelegate.mm
@@ -3,10 +3,12 @@
 
 #import "AppDelegate.hpp"
 #import "MenuProtocol.hpp"
+#include "MappingsWindowController.hpp"
 
 @interface AppDelegate () {
     NSWindow * _window;
     IBOutlet NSMenu * _menu;
+    MappingsWindowController * _mappingsController;
 }
 
 @end
@@ -61,10 +63,25 @@ -(NSMenu *) menu {
     return _menu;
 }
 
+-(void) displayMappingsForLanguage:(NSString *)language {
+    if (!_mappingsController) {
+        _mappingsController = [[MappingsWindowController alloc] initWithWindowNibName:@"mappings"];
+        [_mappingsController.window setLevel:NSMainMenuWindowLevel];
+    }
+    _mappingsController.language = language;
+    [_mappingsController showWindow:self];
+    [_mappingsController.window orderFrontRegardless];
+}
+
+-(void) setMappingsLanguage:(NSString *)language {
+    if (_mappingsController)
+        _mappingsController.language = language;
+}
+
 
-//- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app {
-//    return YES;
-//}
+- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app {
+    return YES;
+}
 
 
 @end
diff --git a/Translit/src/InputController.mm b/Translit/src/InputController.mm
@@ -4,7 +4,7 @@
 #include "Transliterator.hpp"
 #include "AppDelegate.hpp"
 #include "MenuProtocol.hpp"
-#include "MappingsWindowController.hpp"
+
 
 
 @interface InputController : IMKInputController<MenuProtocol>
@@ -14,7 +14,6 @@ @interface InputController : IMKInputController<MenuProtocol>
 
 @interface InputController() {
     std::unique_ptr<Transliterator> _transliterator;
-    MappingsWindowController * _mappingsController;
     NSString * _currentLanguage;
 }
 
@@ -70,11 +69,8 @@ -(NSMenu*) menu
 //MenuProtocol
 
 -(void) displayMappings:(id)sender {
-    if (!_mappingsController)
-        _mappingsController = [[MappingsWindowController alloc] initWithWindowNibName:@"mappings"];
-    _mappingsController.language = _currentLanguage;
-    [_mappingsController showWindow:self];
-    [_mappingsController.window orderFrontRegardless];
+    auto del = (AppDelegate *)NSApp.delegate;
+    [del displayMappingsForLanguage:_currentLanguage];
 }
 
 
@@ -97,16 +93,25 @@ -(void) setValue:(id)value forTag:(long)tag client:(id)sender
             _currentLanguage = val.remove_prefix(prefix).ns_str();
             os_log_info(OS_LOG_DEFAULT, "Setting language to %{public}@", _currentLanguage);
             _transliterator = std::make_unique<Transliterator>(_currentLanguage);
-            if (_mappingsController)
-                _mappingsController.language = _currentLanguage;
+            auto del = (AppDelegate *)NSApp.delegate;
+            [del setMappingsLanguage:_currentLanguage];
         }
     }
     [super setValue:value forTag:tag client:sender];
 }
 
-//-(void) deactivateServer:(id)sender {
-//    os_log_debug(OS_LOG_DEFAULT, "Deactivate");
-//}
+- (void)activateServer:(id)sender {
+    [super activateServer:sender];
+
+    auto del = (AppDelegate *)NSApp.delegate;
+    [del setMappingsLanguage:_currentLanguage];
+}
+
+-(void) deactivateServer:(id)sender {
+    auto del = (AppDelegate *)NSApp.delegate;
+    [del setMappingsLanguage:nil];
+    [super deactivateServer:sender];
+}
 
 //Private
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,9 @@ @@
     @property (nonatomic, readonly) NSMenu * menu;
+    -(void) displayMappingsForLanguage:(NSString *)language;
+    -(void) setMappingsLanguage:(NSString *)language;
     @end
     #endif
@@ Expand Down @@