Revision: 16081
http://sourceforge.net/p/skim-app/code/16081
Author: hofman
Date: 2026-03-20 17:33:42 +0000 (Fri, 20 Mar 2026)
Log Message:
-----------
Ignore nil value in setters
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2026-03-20 17:08:47 UTC (rev 16080)
+++ trunk/SKMainWindowController.m 2026-03-20 17:33:42 UTC (rev 16081)
@@ -408,12 +408,8 @@
[pdfView setDelegate:self];
- NSNumber *widthNumber = [savedNormalSetup
objectForKey:LEFTSIDEPANEWIDTH_KEY] ?: [sud
objectForKey:SKLeftSidePaneWidthKey];
- if (widthNumber)
- [self setLeftSideWidth:widthNumber];
- widthNumber = [savedNormalSetup objectForKey:RIGHTSIDEPANEWIDTH_KEY] ?:
[sud objectForKey:SKRightSidePaneWidthKey] ?: @0.0;
- if (widthNumber)
- [self setRightSideWidth:widthNumber];
+ [self setLeftSideWidth:[savedNormalSetup
objectForKey:LEFTSIDEPANEWIDTH_KEY] ?: [sud
objectForKey:SKLeftSidePaneWidthKey]];
+ [self setRightSideWidth:[savedNormalSetup
objectForKey:RIGHTSIDEPANEWIDTH_KEY] ?: [sud
objectForKey:SKRightSidePaneWidthKey] ?: @0.0];
// this needs to be done before loading the PDFDocument
[self resetThumbnailSizeIfNeeded];
@@ -1341,7 +1337,8 @@
}
- (void)setLeftSideWidth:(NSNumber *)leftSideWidth {
- [splitView setPosition:[leftSideWidth doubleValue] ofDividerAtIndex:0];
+ if (leftSideWidth)
+ [splitView setPosition:[leftSideWidth doubleValue] ofDividerAtIndex:0];
}
- (NSNumber *)rightSideWidth {
@@ -1349,7 +1346,8 @@
}
- (void)setRightSideWidth:(NSNumber *)rightSideWidth {
- [splitView setPosition:[splitView maxPossiblePositionOfDividerAtIndex:1] -
[splitView dividerThickness] - [rightSideWidth doubleValue] ofDividerAtIndex:1];
+ if (rightSideWidth)
+ [splitView setPosition:[splitView
maxPossiblePositionOfDividerAtIndex:1] - [splitView dividerThickness] -
[rightSideWidth doubleValue] ofDividerAtIndex:1];
}
- (BOOL)hasNotes {
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2026-03-20 17:08:47 UTC (rev
16080)
+++ trunk/SKMainWindowController_FullScreen.m 2026-03-20 17:33:42 UTC (rev
16081)
@@ -574,12 +574,8 @@
[pdfView setBackgroundColor:backgroundColor];
[secondaryPdfView setBackgroundColor:backgroundColor];
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKCollapseSidePanesInFullScreenKey]) {
- NSNumber *leftWidthNumber = [savedNormalSetup
objectForKey:LEFTSIDEPANEWIDTH_KEY];
- NSNumber *rightWidthNumber = [savedNormalSetup
objectForKey:RIGHTSIDEPANEWIDTH_KEY];
- if (leftWidthNumber && rightWidthNumber) {
- [self setLeftSideWidth:leftWidthNumber];
- [self setRightSideWidth:rightWidthNumber];
- }
+ [self setLeftSideWidth:[savedNormalSetup
objectForKey:LEFTSIDEPANEWIDTH_KEY]];
+ [self setRightSideWidth:[savedNormalSetup
objectForKey:RIGHTSIDEPANEWIDTH_KEY]];
}
if ([[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey] count])
[pdfView setDisplaySettingsAndRewind:savedNormalSetup];
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
