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

[hofman--- via Bibdesk-commit]

Revision: 26183
          http://sourceforge.net/p/bibdesk/svn/26183
Author:   hofman
Date:     2021-06-09 15:47:07 +0000 (Wed, 09 Jun 2021)
Log Message:
-----------
Make sure complex string editor is removed after abortEditing

Modified Paths:
--------------
    trunk/bibdesk/BDSKEditor.h
    trunk/bibdesk/BDSKEditor.m

Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h  2021-06-09 15:37:24 UTC (rev 26182)
+++ trunk/bibdesk/BDSKEditor.h  2021-06-09 15:47:07 UTC (rev 26183)
@@ -41,7 +41,6 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 #import "BDSKStatusBar.h"
-#import "BDSKComplexStringFormatter.h"
 #import "BDSKCitationFormatter.h"
 #import <FileView/FileView.h>
 #import <Quartz/Quartz.h>
@@ -49,7 +48,7 @@
 #import "BibItem.h"
 
 @class BDSKRatingButton, BDSKRatingButtonCell, BDSKStatusBar, 
BDSKZoomablePDFView, BDSKEditorTableView, BDSKEditorTextView;
-@class BDSKCiteKeyFormatter;
+@class BDSKCiteKeyFormatter, BDSKComplexStringFormatter;
 @class BibAuthor;
 
 /*!

Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m  2021-06-09 15:37:24 UTC (rev 26182)
+++ trunk/bibdesk/BDSKEditor.m  2021-06-09 15:47:07 UTC (rev 26183)
@@ -42,6 +42,9 @@
 #import "BibDocument_DataSource.h"
 #import "NSImage_BDSKExtensions.h"
 #import "BDSKComplexString.h"
+#import "BDSKComplexStringFormatter.h"
+#import "BDSKComplexStringCell.h"
+#import "BDSKComplexStringEditor.h"
 #import "BDSKScriptHookManager.h"
 #import "BDSKEdgeView.h"
 #import "NSString_BDSKExtensions.h"
@@ -382,9 +385,11 @@
         // may be self, if a textview was being edited (but we should have 
taken the first branch in that case)
         if ([control respondsToSelector:@selector(abortEditing)]) {
             [control abortEditing];
-            if (control == tableView)
+            if (control == tableView) {
                 // controlTextDidEndEditing: is not called when calling 
abortEditing
                 [tableCellFormatter setEditAsComplexString:NO];
+                [[[self window] complexStringEditor:NO] remove];
+            }
         }
         else {
             fprintf(stderr, "%s, control does not respond to abortEditing\n", 
__func__);

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