Revision: 16438
http://sourceforge.net/p/skim-app/code/16438
Author: hofman
Date: 2026-09-09 21:41:48 +0000 (Wed, 09 Sep 2026)
Log Message:
-----------
revert testing changes that hiked along
Modified Paths:
--------------
trunk/NSWindowController_SKExtensions.m
trunk/NSWindow_SKExtensions.h
trunk/NSWindow_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_UI.m
Modified: trunk/NSWindowController_SKExtensions.m
===================================================================
--- trunk/NSWindowController_SKExtensions.m 2026-09-09 21:30:54 UTC (rev
16437)
+++ trunk/NSWindowController_SKExtensions.m 2026-09-09 21:41:48 UTC (rev
16438)
@@ -40,7 +40,6 @@
#import "NSPointerArray_SKExtensions.h"
#import "NSPointerFunctions_SKExtensions.h"
#import "NSGeometry_SKExtensions.h"
-#import "NSWindow_SKExtensions.h"
@implementation NSWindowController (SKExtensions)
@@ -55,8 +54,8 @@
NSPoint point;
[self setShouldCascadeWindows:NO];
- [window setSafeFrameUsingName:name];
- if ([window setSafeFrameAutosaveName:name] || pointPtr == NULL) {
+ [window setFrameUsingName:name];
+ if ([window setFrameAutosaveName:name] || pointPtr == NULL) {
point = SKTopLeftPoint([window frame]);
} else {
point = *pointPtr;
Modified: trunk/NSWindow_SKExtensions.h
===================================================================
--- trunk/NSWindow_SKExtensions.h 2026-09-09 21:30:54 UTC (rev 16437)
+++ trunk/NSWindow_SKExtensions.h 2026-09-09 21:41:48 UTC (rev 16438)
@@ -54,12 +54,6 @@
- (BOOL)firstResponderIsDescendantOf:(NSView *)aView;
-- (void)saveSafeFrameUsingName:(NSString *)name;
-- (BOOL)setSafeFrameUsingName:(nullable NSString *)name;
-
-- (nullable NSString *)safeFrameAutosaveName;
-- (BOOL)setSafeFrameAutosaveName:(nullable NSString *)name;
-
@end
NS_ASSUME_NONNULL_END
Modified: trunk/NSWindow_SKExtensions.m
===================================================================
--- trunk/NSWindow_SKExtensions.m 2026-09-09 21:30:54 UTC (rev 16437)
+++ trunk/NSWindow_SKExtensions.m 2026-09-09 21:41:48 UTC (rev 16438)
@@ -39,63 +39,9 @@
#import "NSWindow_SKExtensions.h"
#import "NSDocument_SKExtensions.h"
#import "NSString_SKExtensions.h"
-#import <objc/objc-runtime.h>
@implementation NSWindow (SKExtensions)
-static NSMutableSet *autosaveNames = nil;
-
-static char SKFrameAutosaveNameKey;
-
-- (void)handleAutosavedFrameDidChangeNotification:(NSNotification *)note {
- NSString *name = [self safeFrameAutosaveName];
- if ([name length])
- [self saveSafeFrameUsingName:name];
-}
-
-- (void)saveSafeFrameUsingName:(NSString *)name {
- NSString *key = [NSString stringWithFormat:@"NSWindow Frame %@", name];
- NSString *string = [self stringWithSavedFrame];
- [[NSUserDefaults standardUserDefaults] setObject:string forKey:key];
-}
-
-- (BOOL)setSafeFrameUsingName:(NSString *)name {
- NSString *key = [NSString stringWithFormat:@"NSWindow Frame %@", name];
- NSString *string = [[NSUserDefaults standardUserDefaults]
objectForKey:key];
- if (string == nil)
- return NO;
- [self setFrameFromString:string];
- return YES;
-}
-
-- (NSString *)safeFrameAutosaveName {
- return objc_getAssociatedObject(self, &SKFrameAutosaveNameKey);
-}
-
-- (BOOL)setSafeFrameAutosaveName:(NSString *)name {
- NSString *currentName = [self safeFrameAutosaveName];
- if ([name ?: @"" isEqualToString:currentName ?: @""])
- return YES;
- NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
- if ([currentName length]) {
- [autosaveNames removeObject:currentName];
- objc_setAssociatedObject(self, &SKFrameAutosaveNameKey, nil,
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
- [nc removeObserver:self name:NSWindowDidMoveNotification object:self];
- [nc removeObserver:self name:NSWindowDidResizeNotification
object:self];
- }
- if ([name length] == 0 || [autosaveNames containsObject:name])
- return NO;
- if (autosaveNames == nil)
- autosaveNames = [NSMutableSet set];
- [autosaveNames addObject:name];
- objc_setAssociatedObject(self, &SKFrameAutosaveNameKey, name,
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
- if ([self setSafeFrameUsingName:name] == NO)
- [self saveSafeFrameUsingName:name];
- [nc addObserver:self
selector:@selector(handleAutosavedFrameDidChangeNotification:)
name:NSWindowDidMoveNotification object:self];
- [nc addObserver:self
selector:@selector(handleAutosavedFrameDidChangeNotification:)
name:NSWindowDidResizeNotification object:self];
- return YES;
-}
-
+ (void)addTabs:(NSArray *)tabInfos forWindows:(NSArray *)windows {
if ([windows count] < 2)
return;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2026-09-09 21:30:54 UTC (rev 16437)
+++ trunk/SKMainWindowController.m 2026-09-09 21:41:48 UTC (rev 16438)
@@ -311,8 +311,6 @@
[noteTypeSheetController setDelegate:nil];
[[pdfView document] setContainingDocument:nil];
[self setPresentationNotesDocument:nil];
- if ([[[self window] safeFrameAutosaveName] length])
- [[self window] setSafeFrameAutosaveName:nil];
}
- (void)windowDidLoad{
@@ -2759,7 +2757,7 @@
[toolbarController leftSidePaneDidShowOrHide:[item
isCollapsed] == NO];
else if ([item viewController] == rightSideController)
[toolbarController rightSidePaneDidShowOrHide:[item
isCollapsed] == NO];
- if (0&[[[self window] frameAutosaveName] length])
+ if ([[[self window] frameAutosaveName] length])
[self performSelectorOnce:@selector(sidePaneWidthDidChange)
afterDelay:0.0];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2026-09-09 21:30:54 UTC (rev 16437)
+++ trunk/SKMainWindowController_UI.m 2026-09-09 21:41:48 UTC (rev 16438)
@@ -88,7 +88,6 @@
#import "SKBookmarkController.h"
#import "SKNoteToolbarController.h"
#import "SKPresentationNotesAuxiliary.h"
-#import "NSWindow_SKExtensions.h"
#define NOTES_KEY @"notes"
#define SNAPSHOTS_KEY @"snapshots"
@@ -2138,11 +2137,11 @@
[nc addObserver:self
selector:@selector(handlePageLabelsChangedNotification:)
name:SKPDFPageLabelsChangedNotification
object:nil];
// NSSplitView
- if ([[[self window] safeFrameAutosaveName] length]) {
+ if ([[[self window] frameAutosaveName] length]) {
[nc addObserver:self
selector:@selector(handleSidePaneViewFrameDidChangeNotification:)
- name:NSSplitViewDidResizeSubviewsNotification
object:splitViewController.splitView];
- //[nc addObserver:self
selector:@selector(handleSidePaneViewFrameDidChangeNotification:)
- // name:NSViewFrameDidChangeNotification
object:rightSideController.view];
+ name:NSViewFrameDidChangeNotification
object:leftSideController.view];
+ [nc addObserver:self
selector:@selector(handleSidePaneViewFrameDidChangeNotification:)
+ name:NSViewFrameDidChangeNotification
object:rightSideController.view];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
