Revision: 14377
http://sourceforge.net/p/skim-app/code/14377
Author: hofman
Date: 2024-07-12 14:47:15 +0000 (Fri, 12 Jul 2024)
Log Message:
-----------
no need for gloabl variable for preference setting
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-07-12 14:14:58 UTC (rev 14376)
+++ trunk/SKMainWindowController.m 2024-07-12 14:47:15 UTC (rev 14377)
@@ -207,8 +207,6 @@
- (void)clearWidgets;
-+ (void)defineFullScreenGlobalVariables;
-
@end
@@ -217,11 +215,6 @@
@synthesize mainWindow, splitView, topConstraint, centerContentView,
pdfSplitView, pdfContentView, findBarTopConstraint, statusBar, pdfView,
secondaryPdfView, leftSideController, rightSideController, leftSideContentView,
rightSideContentView, presentationNotesDocument, presentationNotesOffset,
notes, thumbnails, snapshots, searchResults, groupedSearchResults, tags,
rating, pageLabel, interactionMode, placeholderPdfDocument;
@dynamic pdfDocument, presentationOptions, presentationUndoManager,
selectedNotes, hasNotes, widgetProperties, leftSidePaneState,
rightSidePaneState, findPaneState, displaysFindPane, leftSidePaneIsOpen,
rightSidePaneIsOpen, recentInfoNeedsUpdate, searchString, hasOverview,
notesMenu;
-+ (void)initialize {
- SKINITIALIZE;
- [self defineFullScreenGlobalVariables];
-}
-
+ (BOOL)automaticallyNotifiesObserversOfPageLabel { return NO; }
- (instancetype)init {
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2024-07-12 14:14:58 UTC (rev
14376)
+++ trunk/SKMainWindowController_FullScreen.m 2024-07-12 14:47:15 UTC (rev
14377)
@@ -84,8 +84,6 @@
#define PRESENTATION_DURATION 0.5
-static BOOL autoHideToolbarInFullScreen = NO;
-
static CGFloat fullScreenToolbarOffset = 0.0;
@interface SKMainWindowController (SKFullScreenPrivate)
@@ -94,10 +92,6 @@
@implementation SKMainWindowController (FullScreen)
-+ (void)defineFullScreenGlobalVariables {
- autoHideToolbarInFullScreen = [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoHideToolbarInFullScreenKey];
-}
-
#pragma mark Side Windows
- (void)showSideWindow {
@@ -301,7 +295,7 @@
- (void)displayStaticContentForWindow:(NSWindow *)window {
NSRect frame = [window frame];
CGImageRef cgImage = CGWindowListCreateImage(CGRectNull,
kCGWindowListOptionIncludingWindow, (CGWindowID)[window windowNumber],
kCGWindowImageBoundsIgnoreFraming | kCGWindowImageBestResolution);
- if (([window styleMask] & NSWindowStyleMaskFullScreen) != 0 &&
autoHideToolbarInFullScreen == NO && [[window toolbar] isVisible]) {
+ if (([window styleMask] & NSWindowStyleMaskFullScreen) != 0 &&
autoHideToolbarInFullScreen() == NO && [[window toolbar] isVisible]) {
NSWindow *tbWindow = nil;
for (tbWindow in [window childWindows])
if ([NSStringFromClass([tbWindow class])
containsString:@"Toolbar"])
@@ -613,9 +607,13 @@
#pragma mark NSWindowDelegate Full Screen Methods
+static inline BOOL autoHideToolbarInFullScreen() {
+ return [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoHideToolbarInFullScreenKey];
+}
+
static inline CGFloat fullScreenOffset(NSWindow *window) {
CGFloat offset = 17.0;
- if (autoHideToolbarInFullScreen)
+ if (autoHideToolbarInFullScreen())
offset = NSHeight([window frame]) - NSHeight([window
contentLayoutRect]);
else if ([[window toolbar] isVisible] == NO)
offset = NSHeight([NSWindow frameRectForContentRect:NSZeroRect
styleMask:NSWindowStyleMaskTitled]);
@@ -674,7 +672,7 @@
}
- (NSApplicationPresentationOptions)window:(NSWindow *)window
willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
{
- if (autoHideToolbarInFullScreen)
+ if (autoHideToolbarInFullScreen())
return proposedOptions | NSApplicationPresentationAutoHideToolbar;
return proposedOptions;
}
@@ -691,7 +689,7 @@
}
- (void)window:(NSWindow *)window
startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration {
- if (fullScreenToolbarOffset <= 0.0 && autoHideToolbarInFullScreen == NO &&
[[mainWindow toolbar] isVisible])
+ if (fullScreenToolbarOffset <= 0.0 && autoHideToolbarInFullScreen() == NO
&& [[mainWindow toolbar] isVisible])
fullScreenToolbarOffset = toolbarViewOffset(mainWindow);
NSRect frame = SKShrinkRect([[window screen] frame],
-fullScreenOffset(window), NSMaxYEdge);
if ([[NSUserDefaults standardUserDefaults]
boolForKey:AppleMenuBarVisibleInFullscreenKey])
@@ -729,7 +727,7 @@
}
- (void)windowDidEnterFullScreen:(NSNotification *)notification {
- if (fullScreenToolbarOffset < 0.0 && autoHideToolbarInFullScreen == NO &&
[[mainWindow toolbar] isVisible]) {
+ if (fullScreenToolbarOffset < 0.0 && autoHideToolbarInFullScreen() == NO
&& [[mainWindow toolbar] isVisible]) {
CGFloat toolbarItemOffset = toolbarViewOffset(mainWindow);
if (toolbarItemOffset < 0.0)
// save the offset for the next time, we may guess it wrong as it
varies between OS versions
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
