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

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

Revision: 13396
          http://sourceforge.net/p/skim-app/code/13396
Author:   hofman
Date:     2023-03-20 14:57:08 +0000 (Mon, 20 Mar 2023)
Log Message:
-----------
make sure to disable contrained frame before setting the frame

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

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2023-03-20 10:00:36 UTC (rev 
13395)
+++ trunk/SKMainWindowController_FullScreen.m   2023-03-20 14:57:08 UTC (rev 
13396)
@@ -650,14 +650,15 @@
                 SKDESTROY(animationWindow);
             }];
     } else {
+        [(SKMainWindow *)window setDisableConstrainedFrame:YES];
         [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
                 [context setDuration:duration - 0.02];
-                [(SKMainWindow *)window setDisableConstrainedFrame:YES];
                 [[window animator] setFrame:frame display:YES];
                 setAlphaValueOfTitleBarControls(window, 0.0, YES);
+            }
+            completionHandler:^{
                 [(SKMainWindow *)window setDisableConstrainedFrame:NO];
-            }
-            completionHandler:^{}];
+            }];
     }
 }
 
@@ -743,16 +744,16 @@
     } else {
         [window setStyleMask:[window styleMask] & 
~NSWindowStyleMaskFullScreen];
         setAlphaValueOfTitleBarControls(window, 0.0, NO);
+        [(SKMainWindow *)window setDisableConstrainedFrame:YES];
         [window setFrame:SKShrinkRect([[window screen] frame], 
-fullScreenOffset(window), NSMaxYEdge) display:YES];
         [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