Revision: 15260
          http://sourceforge.net/p/skim-app/code/15260
Author:   hofman
Date:     2025-05-23 14:35:30 +0000 (Fri, 23 May 2025)
Log Message:
-----------
Don't enforce showing normal window after presentation in active space when it 
is moved into a tab. However it will show up in the active space anyway, even 
if the other tabbed windows are in another space, which looks like buggy 
behavior.

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

Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m   2025-05-23 09:38:14 UTC (rev 
15259)
+++ trunk/SKMainWindowController_FullScreen.m   2025-05-23 14:35:30 UTC (rev 
15260)
@@ -221,7 +221,7 @@
     [mainWindow setAlphaValue:0.0];
     [mainWindow setAnimationBehavior:NSWindowAnimationBehaviorNone];
     [mainWindow setLevel:NSNormalWindowLevel];
-    if (NSPointInRect(SKCenterPoint([mainWindow frame]), [[presentationWindow 
screen] frame])) {
+    if (NSPointInRect(SKCenterPoint([mainWindow frame]), [[presentationWindow 
screen] frame]) && [[[savedNormalSetup objectForKey:TABGROUP_KEY] windows] 
count] == 0) {
         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];
@@ -496,7 +496,6 @@
         NSUInteger tabIndex = [[savedNormalSetup objectForKey:TABINDEX_KEY] 
unsignedIntegerValue];
         noFadeIn = YES;
         [mainWindow setAlphaValue:1.0];
-        [mainWindow setCollectionBehavior:[mainWindow collectionBehavior] & 
~NSWindowCollectionBehaviorMoveToActiveSpace];
         [tabGroup insertWindow:mainWindow atIndex:MIN(tabIndex, [[tabGroup 
windows] count])];
     }
     

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

Reply via email to