[Skim-app-commit] SF.net SVN: skim-app:[13342] trunk

[hofman--- via Skim-app-commit]

Revision: 13342
          http://sourceforge.net/p/skim-app/code/13342
Author:   hofman
Date:     2023-03-04 18:08:32 +0000 (Sat, 04 Mar 2023)
Log Message:
-----------
Use field editor subclass throughout pref window and main window. Ignore all 
relevant action methods.

Modified Paths:
--------------
    trunk/SKFieldEditor.m
    trunk/SKMainWindowController_UI.m
    trunk/SKPreferenceController.m

Modified: trunk/SKFieldEditor.m
===================================================================
--- trunk/SKFieldEditor.m       2023-03-04 14:44:52 UTC (rev 13341)
+++ trunk/SKFieldEditor.m       2023-03-04 18:08:32 UTC (rev 13342)
@@ -43,7 +43,9 @@
 
 - (BOOL)respondsToSelector:(SEL)aSelector {
     if (aSelector == @selector(performFindPanelAction:) ||
-        aSelector == @selector(centerSelectionInVisibleArea:))
+        aSelector == @selector(centerSelectionInVisibleArea:) ||
+        aSelector == @selector(changeFont:) ||
+        aSelector == @selector(changeAttributes:))
         return NO;
     return [super respondsToSelector:aSelector];
 }

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2023-03-04 14:44:52 UTC (rev 13341)
+++ trunk/SKMainWindowController_UI.m   2023-03-04 18:08:32 UTC (rev 13342)
@@ -305,14 +305,11 @@
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject {
-    if ([anObject isEqual:[findController findField]]) {
-        if (fieldEditor == nil) {
-            fieldEditor = [[SKFieldEditor alloc] init];
-            [fieldEditor setFieldEditor:YES];
-        }
-        return fieldEditor;
+    if (fieldEditor == nil) {
+        fieldEditor = [[SKFieldEditor alloc] init];
+        [fieldEditor setFieldEditor:YES];
     }
-    return nil;
+    return fieldEditor;
 }
 
 - (void)window:(NSWindow *)sender willSendEvent:(NSEvent *)event {

Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m      2023-03-04 14:44:52 UTC (rev 13341)
+++ trunk/SKPreferenceController.m      2023-03-04 18:08:32 UTC (rev 13342)
@@ -43,6 +43,7 @@
 #import "SKSyncPreferences.h"
 #import "NSUserDefaultsController_SKExtensions.h"
 #import "SKFontWell.h"
+#import "SKFieldEditor.h"
 #import "SKStringConstants.h"
 #import "NSView_SKExtensions.h"
 #import "NSGraphics_SKExtensions.h"
@@ -66,9 +67,6 @@
 #define INITIALUSERDEFAULTS_KEY @"InitialUserDefaults"
 #define RESETTABLEKEYS_KEY @"ResettableKeys"
 
-@interface SKPreferenceFieldEditor : NSTextView
-@end
-
 @implementation SKPreferenceController
 
 @synthesize resetButton, resetAllButton;
@@ -240,14 +238,11 @@
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject {
-    if ([[currentPane nibName] isEqualToString:@"NotesPreferences"]) {
-        if (fieldEditor == nil) {
-            fieldEditor = [[SKPreferenceFieldEditor alloc] init];
-            [fieldEditor setFieldEditor:YES];
-        }
-        return fieldEditor;
+    if (fieldEditor == nil) {
+        fieldEditor = [[SKFieldEditor alloc] init];
+        [fieldEditor setFieldEditor:YES];
     }
-    return nil;
+    return fieldEditor;
 }
 
 #pragma mark Actions
@@ -408,15 +403,3 @@
 }
 
 @end
-
-
-@implementation SKPreferenceFieldEditor
-
-- (BOOL)respondsToSelector:(SEL)aSelector {
-    if (aSelector == @selector(changeFont:) ||
-        aSelector == @selector(changeAttributes:))
-        return NO;
-    return [super respondsToSelector:aSelector];
-}
-
-@end

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit