Revision: 12078
http://sourceforge.net/p/skim-app/code/12078
Author: hofman
Date: 2020-12-01 10:14:06 +0000 (Tue, 01 Dec 2020)
Log Message:
-----------
reorder code
Modified Paths:
--------------
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2020-11-30 22:57:54 UTC (rev
12077)
+++ trunk/SKMainWindowController_FullScreen.m 2020-12-01 10:14:06 UTC (rev
12078)
@@ -319,12 +319,11 @@
- (void)fadeOutFullScreenWindow {
SKFullScreenWindow *fullScreenWindow = (SKFullScreenWindow *)[[[self
window] retain] autorelease];
- NSWindowCollectionBehavior collectionBehavior = [mainWindow
collectionBehavior];
- NSRect screenFrame = [[fullScreenWindow screen] frame];
[self setWindow:mainWindow];
- if (NSPointInRect(SKCenterPoint([mainWindow frame]), screenFrame)) {
- [mainWindow setAlphaValue:0.0];
+ [mainWindow setAlphaValue:0.0];
+ if (NSPointInRect(SKCenterPoint([mainWindow frame]), [[fullScreenWindow
screen] frame])) {
+ NSWindowCollectionBehavior collectionBehavior = [mainWindow
collectionBehavior];
[mainWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
// trick to make sure the main window shows up in the same space as
the fullscreen window
[fullScreenWindow addChildWindow:mainWindow ordered:NSWindowBelow];
@@ -336,7 +335,6 @@
[mainWindow setAlphaValue:1.0];
[mainWindow setCollectionBehavior:collectionBehavior];
} else {
- [mainWindow setAlphaValue:0.0];
[mainWindow makeKeyAndOrderFront:nil];
}
[mainWindow display];
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
