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

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

Revision: 15262
          http://sourceforge.net/p/skim-app/code/15262
Author:   hofman
Date:     2025-05-23 14:56:50 +0000 (Fri, 23 May 2025)
Log Message:
-----------
move presentation window to hogher level and remove windows menu item after 
rermoving it as ouw window

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

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2025-05-23 14:53:35 UTC (rev 
15261)
+++ trunk/SKMainWindowController_FullScreen.m   2025-05-23 14:56:50 UTC (rev 
15262)
@@ -217,13 +217,13 @@
 - (void)showNormalWindow {
     NSWindowTabGroup *tabGroup = [savedNormalSetup objectForKey:TABGROUP_KEY];
     BOOL moveToTab = [[tabGroup windows] count] > 0;
-    NSScreen *presentationScreen = [[self window] screen];
+    NSWindow *presentationWindow = [self window];
     
     [self setWindow:mainWindow];
     [mainWindow setAlphaValue:0.0];
     [mainWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
     [mainWindow setLevel:NSNormalWindowLevel];
-    if (NSPointInRect(SKCenterPoint([mainWindow frame]), [presentationScreen 
frame]) && moveToTab == NO) {
+    if (NSPointInRect(SKCenterPoint([mainWindow frame]), [[presentationWindow 
screen] frame]) && moveToTab == NO) {
         NSWindowCollectionBehavior collectionBehavior = [mainWindow 
collectionBehavior];
         // trick to make sure the main window shows up in the same space as 
the fullscreen window
         [mainWindow setCollectionBehavior:collectionBehavior | 
NSWindowCollectionBehaviorMoveToActiveSpace];
@@ -241,6 +241,9 @@
     [NSApp updatePresentationOptionsForWindow:mainWindow];
     [mainWindow setAnimationBehavior:NSWindowAnimationBehaviorDefault];
 
+    [NSApp removeWindowsItem:presentationWindow];
+    [presentationWindow setLevel:NSPopUpMenuWindowLevel];
+    
     if (moveToTab) {
         NSUInteger tabIndex = [[savedNormalSetup objectForKey:TABINDEX_KEY] 
unsignedIntegerValue];
         [mainWindow setAlphaValue:1.0];
@@ -490,9 +493,6 @@
     
     [touchBarController interactionModeChanged];
     
-    [NSApp removeWindowsItem:presentationWindow];
-    [presentationWindow setLevel:NSPopUpMenuWindowLevel];
-    
     [self showNormalWindow];
     
     [savedNormalSetup removeAllObjects];

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