[Skim-app-commit] SF.net SVN: skim-app:[13395] trunk/SKMainWindowController_FullScreen.m

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

Revision: 13395
          http://sourceforge.net/p/skim-app/code/13395
Author:   hofman
Date:     2023-03-20 10:00:36 +0000 (Mon, 20 Mar 2023)
Log Message:
-----------
only disable window contraint frame when changing the frame

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

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2023-03-20 09:55:16 UTC (rev 
13394)
+++ trunk/SKMainWindowController_FullScreen.m   2023-03-20 10:00:36 UTC (rev 
13395)
@@ -633,9 +633,9 @@
     if (fullScreenToolbarOffset <= 0.0 && autoHideToolbarInFullScreen == NO && 
[[mainWindow toolbar] isVisible])
         fullScreenToolbarOffset = toolbarViewOffset(mainWindow);
     NSRect frame = SKShrinkRect([[window screen] frame], 
-fullScreenOffset(window), NSMaxYEdge);
-    [(SKMainWindow *)window setDisableConstrainedFrame:YES];
     if (animationWindow != nil) {
         [self showStaticContentForWindow:window];
+        [(SKMainWindow *)window setDisableConstrainedFrame:YES];
         [window setFrame:frame display:YES];
         [window orderWindow:NSWindowAbove relativeTo:animationWindow];
         setAlphaValueOfTitleBarControls(window, 0.0, NO);
@@ -652,12 +652,12 @@
     } else {
         [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
                 [context setDuration:duration - 0.02];
+                [(SKMainWindow *)window setDisableConstrainedFrame:YES];
                 [[window animator] setFrame:frame display:YES];
                 setAlphaValueOfTitleBarControls(window, 0.0, YES);
+                [(SKMainWindow *)window setDisableConstrainedFrame:NO];
             }
-            completionHandler:^{
-                [(SKMainWindow *)window setDisableConstrainedFrame:NO];
-            }];
+            completionHandler:^{}];
     }
 }
 
@@ -741,7 +741,6 @@
                 SKDESTROY(animationWindow);
             }];
     } else {
-        [(SKMainWindow *)window setDisableConstrainedFrame:YES];
         [window setStyleMask:[window styleMask] & 
~NSWindowStyleMaskFullScreen];
         setAlphaValueOfTitleBarControls(window, 0.0, NO);
         [window setFrame:SKShrinkRect([[window screen] frame], 
-fullScreenOffset(window), NSMaxYEdge) display:YES];
@@ -748,11 +747,12 @@
         [window setLevel:NSStatusWindowLevel];
         [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
                 [context setDuration:duration];
+                [(SKMainWindow *)window setDisableConstrainedFrame:YES];
                 [[window animator] setFrame:frame display:YES];
                 setAlphaValueOfTitleBarControls(window, 1.0, YES);
+                [(SKMainWindow *)window setDisableConstrainedFrame:NO];
             }
             completionHandler:^{
-                [(SKMainWindow *)window setDisableConstrainedFrame:NO];
                 [window setLevel:NSNormalWindowLevel];
             }];
     }

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