[Skim-app-commit] SF.net SVN: skim-app:[14989] trunk/SKMainWindowContro ller_FullScreen.m

[hofman--- via Skim-app-commit]

Revision: 14989
          http://sourceforge.net/p/skim-app/code/14989
Author:   hofman
Date:     2025-03-19 15:07:41 +0000 (Wed, 19 Mar 2025)
Log Message:
-----------
modify custom fullscreen animation when toolbar style is not expanded

Modified Paths:
--------------
    trunk/SKMainWindowController_FullScreen.m

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2025-03-18 16:58:38 UTC (rev 
14988)
+++ trunk/SKMainWindowController_FullScreen.m   2025-03-19 15:07:41 UTC (rev 
14989)
@@ -551,16 +551,22 @@
 }
 
 static inline CGFloat fullScreenOffset(NSWindow *window) {
-    CGFloat offset = 17.0;
-    if (autoHideToolbarInFullScreen())
-        offset = NSHeight([window frame]) - NSHeight([window 
contentLayoutRect]);
-    else if ([[window toolbar] isVisible] == NO)
-        offset = NSHeight([NSWindow frameRectForContentRect:NSZeroRect 
styleMask:NSWindowStyleMaskTitled]);
-    else if (fullScreenToolbarOffset > 0.0)
-        offset = fullScreenToolbarOffset;
-    else if (@available(macOS 11.0, *))
-        offset = 16.0;
-    return offset;
+    if (autoHideToolbarInFullScreen()) {
+        return NSHeight([window frame]) - NSHeight([window contentLayoutRect]);
+    } else if ([[window toolbar] isVisible] == NO) {
+        return NSHeight([NSWindow frameRectForContentRect:NSZeroRect 
styleMask:NSWindowStyleMaskTitled]);
+    } else if (@available(macOS 11.0, *)) {
+        if ([window toolbarStyle] != NSWindowToolbarStyleExpanded)
+            return 0.0;
+        else if (fullScreenToolbarOffset > 0.0)
+            return fullScreenToolbarOffset;
+        else
+            return 16.0;
+    } else if (fullScreenToolbarOffset > 0.0) {
+        return fullScreenToolbarOffset;
+    } else {
+        return 17.0;
+    }
 }
 
 static inline CGFloat toolbarViewOffset(NSWindow *window) {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit