Revision: 12177
http://sourceforge.net/p/skim-app/code/12177
Author: hofman
Date: 2021-03-08 18:29:37 +0000 (Mon, 08 Mar 2021)
Log Message:
-----------
Don't save fullscreen offset in preferences; the OS version numbers are
changing too fast now with Big Sur. Use 16 by default for Big Sur.
Modified Paths:
--------------
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2021-03-08 18:07:33 UTC (rev
12176)
+++ trunk/SKMainWindowController_FullScreen.m 2021-03-08 18:29:37 UTC (rev
12177)
@@ -80,7 +80,6 @@
static BOOL autoHideToolbarInFullScreen = NO;
static BOOL collapseSidePanesInFullScreen = NO;
-static NSString *SKFullScreenToolbarOffsetKey = nil;
static CGFloat fullScreenToolbarOffset = 0.0;
@interface SKMainWindowController (SKFullScreenPrivate)
@@ -94,9 +93,7 @@
autoHideToolbarInFullScreen = [sud
boolForKey:SKAutoHideToolbarInFullScreenKey];
collapseSidePanesInFullScreen = [sud
boolForKey:SKCollapseSidePanesInFullScreenKey];
- NSOperatingSystemVersion systemVersion = [[NSProcessInfo processInfo]
operatingSystemVersion];
- SKFullScreenToolbarOffsetKey = [[NSString alloc]
initWithFormat:@"SKFullScreenToolbarOffset%ld_%ld",
(long)systemVersion.majorVersion, (long)systemVersion.minorVersion];
- fullScreenToolbarOffset = [sud doubleForKey:SKFullScreenToolbarOffsetKey];
+ fullScreenToolbarOffset = 0.0;
}
#pragma mark Side Windows
@@ -486,6 +483,8 @@
offset = NSHeight([NSWindow frameRectForContentRect:NSZeroRect
styleMask:NSTitledWindowMask]);
else if (fullScreenToolbarOffset > 0.0)
offset = fullScreenToolbarOffset;
+ else if (RUNNING_AFTER(10_15))
+ offset = 16.0;
else if (!RUNNING_BEFORE(10_11))
offset = 17.0;
else
@@ -550,8 +549,6 @@
if (toolbarItemOffset < 0.0)
// save the offset for the next time, we may guess it wrong as it
varies between OS versions
fullScreenToolbarOffset = toolbarItemOffset -
fullScreenToolbarOffset;
- if (SKFullScreenToolbarOffsetKey)
- [[NSUserDefaults standardUserDefaults]
setDouble:fullScreenToolbarOffset forKey:SKFullScreenToolbarOffsetKey];
}
NSColor *backgroundColor = [PDFView defaultFullScreenBackgroundColor];
NSDictionary *fullScreenSetup = [[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey];
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
