[Bibdesk-commit] SF.net SVN: bibdesk:[26167] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 26167
          http://sourceforge.net/p/bibdesk/svn/26167
Author:   hofman
Date:     2021-06-07 22:40:22 +0000 (Mon, 07 Jun 2021)
Log Message:
-----------
Remove complex string editor when dismissing a sheet

Modified Paths:
--------------
    trunk/bibdesk/BDSKComplexStringFormatter.h
    trunk/bibdesk/BDSKComplexStringFormatter.m
    trunk/bibdesk/BDSKMacroWindowController.m
    trunk/bibdesk/BDSKTextImportController.m

Modified: trunk/bibdesk/BDSKComplexStringFormatter.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringFormatter.h  2021-06-07 22:25:27 UTC (rev 
26166)
+++ trunk/bibdesk/BDSKComplexStringFormatter.h  2021-06-07 22:40:22 UTC (rev 
26167)
@@ -50,5 +50,6 @@
 @property (nonatomic) BOOL editAsComplexString;
 
 - (void)attachComplexStringEditorForCell:(NSTextFieldCell *)cell;
+- (void)removeComplexStringEditor;
 
 @end

Modified: trunk/bibdesk/BDSKComplexStringFormatter.m
===================================================================
--- trunk/bibdesk/BDSKComplexStringFormatter.m  2021-06-07 22:25:27 UTC (rev 
26166)
+++ trunk/bibdesk/BDSKComplexStringFormatter.m  2021-06-07 22:40:22 UTC (rev 
26167)
@@ -60,8 +60,7 @@
 }
 
 - (void)dealloc {
-    if ([complexStringEditor isAttached])
-        [complexStringEditor remove];
+    [self removeComplexStringEditor];
     BDSKDESTROY(macroResolver);
     BDSKDESTROY(complexStringEditor);
     [super dealloc];
@@ -141,4 +140,9 @@
     }
 }
 
+- (void)removeComplexStringEditor {
+    if ([complexStringEditor isAttached])
+        [complexStringEditor remove];
+}
+
 @end

Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m   2021-06-07 22:25:27 UTC (rev 
26166)
+++ trunk/bibdesk/BDSKMacroWindowController.m   2021-06-07 22:40:22 UTC (rev 
26167)
@@ -179,6 +179,7 @@
         [[self window] endEditingFor:nil];
     if (macroResolver != [BDSKMacroResolver defaultMacroResolver])
         [tableView setTypeSelectHelper:nil];
+    [tableCellFormatter removeComplexStringEditor];
 }
 
 // we want to have the same undoManager as our document, so we use this 
@@ -326,10 +327,6 @@
 - (IBAction)closeAction:(id)sender{
        if ([[self window] isSheet]) {
                [self windowWillClose:nil];
-        for (NSWindow *childWindow in [[self window] childWindows]) {
-            [[self window] removeChildWindow:childWindow];
-            [childWindow orderOut:nil];
-        }
         [self dismiss:sender];
        } else {
                [[self window] performClose:sender];

Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m    2021-06-07 22:25:27 UTC (rev 
26166)
+++ trunk/bibdesk/BDSKTextImportController.m    2021-06-07 22:40:22 UTC (rev 
26167)
@@ -262,10 +262,7 @@
     
     [itemTableView setTypeSelectHelper:nil];
     
-    for (NSWindow *childWindow in [[self window] childWindows]) {
-        [[self window] removeChildWindow:childWindow];
-        [childWindow orderOut:nil];
-    }
+    [tableCellFormatter removeComplexStringEditor];
     
     [super dismiss:sender];
 }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit