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

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

Revision: 16075
          http://sourceforge.net/p/skim-app/code/16075
Author:   hofman
Date:     2026-03-18 18:30:10 +0000 (Wed, 18 Mar 2026)
Log Message:
-----------
fix animation with tab bar and note toolbar

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

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2026-03-18 18:18:08 UTC (rev 
16074)
+++ trunk/SKMainWindowController_FullScreen.m   2026-03-18 18:30:10 UTC (rev 
16075)
@@ -525,10 +525,8 @@
     return view ? NSMaxY([[view window] convertRectToScreen:[view 
convertRect:[view bounds] toView:nil]]) - NSMaxY([[view window] frame]) : 0.0;
 }
 
-static inline CGFloat fullScreenOffset(NSWindow *window, CGFloat 
accessoryHeight) {
-    if (accessoryHeight > 0.0)
-        return NSHeight([window frame]) - NSHeight([window contentLayoutRect]) 
- accessoryHeight;
-    else if (hasUnifiedToolbar(window))
+static inline CGFloat fullScreenOffset(NSWindow *window) {
+    if (hasUnifiedToolbar(window))
         return 0.0;
     if (fullScreenToolbarOffset <= 0.0)
         fullScreenToolbarOffset = toolbarViewOffset(window);
@@ -634,13 +632,18 @@
             showToolbarWindow = NO;
     }
     if (showToolbarWindow) {
-        CGFloat offset = fullScreenOffset(window, accessoryHeight);
+        CGFloat offset = 0.0;
+        if (accessoryHeight > 0.0) {
+            offset = NSHeight([window frame]) - NSHeight([window 
contentLayoutRect]) - accessoryHeight;
+        } else {
+            offset = fullScreenOffset(window);
+            NSUInteger i = noteToolbarController && [noteToolbarController 
fullScreenMinHeight] <= 0.0 ? [[window titlebarAccessoryViewControllers] 
indexOfObject:noteToolbarController] : NSNotFound;
+            if (i != NSNotFound) {
+                noteToolbar = noteToolbarController;
+                [window removeTitlebarAccessoryViewControllerAtIndex:i];
+            }
+        }
         frame.size.height += offset;
-        NSUInteger i = noteToolbarController && [noteToolbarController 
fullScreenMinHeight] <= 0.0 ? [[window titlebarAccessoryViewControllers] 
indexOfObject:noteToolbarController] : NSNotFound;
-        if (i != NSNotFound) {
-            noteToolbar = noteToolbarController;
-            [window removeTitlebarAccessoryViewControllerAtIndex:i];
-        }
         [(SKMainWindow *)window setFrameWithoutConstrain:frame];
         if (showMenuBarInFullScreen && offset > 0.0) {
             blackLayer = [CALayer layer];

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