Revision: 15360
http://sourceforge.net/p/skim-app/code/15360
Author: hofman
Date: 2025-06-04 09:19:30 +0000 (Wed, 04 Jun 2025)
Log Message:
-----------
Don't set (extended) display mode from setup in presentation mode, leave it
till exit. Set extended display mode fully from settings
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKPDFView.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-06-04 09:00:11 UTC (rev 15359)
+++ trunk/SKMainWindowController.m 2025-06-04 09:19:30 UTC (rev 15360)
@@ -575,8 +575,16 @@
[savedNormalSetup addEntriesFromDictionary:setup];
[savedNormalSetup
removeObjectsForKeys:@[LEFTSIDEPANEWIDTH_KEY, RIGHTSIDEPANEWIDTH_KEY,
CROPBOXES_KEY, SNAPSHOTS_KEY, PAGEINDEX_KEY, SCROLLPOINT_KEY]];
}
- if ([self interactionMode] != SKFullScreenMode ||
[[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey] count] == 0)
- [pdfView setDisplaySettings:setup];
+ if ([self interactionMode] == SKPresentationMode) {
+ NSMutableDictionary *mutableSetup = [setup mutableCopy];
+ [mutableSetup removeObjectsForKeys:@[@"displayMode",
@"displayDirection"]];
+ [pdfView setDisplaySettings:mutableSetup];
+ } else if ([self interactionMode] != SKFullScreenMode ||
[[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey] count] == 0) {
+ if ([setup objectForKey:PAGEINDEX_KEY])
+ [pdfView setDisplaySettings:setup];
+ else
+ [pdfView setDisplaySettingsAndRewind:setup];
+ }
[self applyChangedCropBoxes:[setup objectForKey:CROPBOXES_KEY]
inDocument:[self pdfDocument]];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-06-04 09:00:11 UTC (rev 15359)
+++ trunk/SKPDFView.m 2025-06-04 09:19:30 UTC (rev 15360)
@@ -970,10 +970,12 @@
[self setDisplaysPageBreaks:[number boolValue]];
if ((number = [setup objectForKey:DISPLAYSASBOOK_KEY]))
[self setDisplaysAsBook:[number boolValue]];
- if ((number = [setup objectForKey:DISPLAYMODE_KEY]))
- [self setExtendedDisplayMode:[number integerValue]];
- if ((number = [setup objectForKey:DISPLAYDIRECTION_KEY]))
- [self setDisplaysHorizontally:[number boolValue]];
+ if ((number = [setup objectForKey:DISPLAYMODE_KEY])) {
+ if ([number integerValue] != kPDFDisplaySinglePageContinuous)
+ [self setExtendedDisplayMode:[number integerValue]];
+ else
+ [self setExtendedDisplayMode:[[setup
objectForKey:DISPLAYDIRECTION_KEY] boolValue] ? kPDFDisplayHorizontalContinuous
: kPDFDisplaySinglePageContinuous];
+ }
if ((number = [setup objectForKey:DISPLAYSRTL_KEY]))
[self setDisplaysRTL:[number boolValue]];
if ((number = [setup objectForKey:DISPLAYBOX_KEY]))
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
