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

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

Revision: 16452
          http://sourceforge.net/p/skim-app/code/16452
Author:   hofman
Date:     2026-09-12 15:53:17 +0000 (Sat, 12 Sep 2026)
Log Message:
-----------
always layout the main split view before swapping in the pdf view, so we can 
give the pdf view the correct size

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2026-09-11 16:54:48 UTC (rev 16451)
+++ trunk/SKMainWindowController.m      2026-09-12 15:53:17 UTC (rev 16452)
@@ -464,16 +464,13 @@
         [[[splitViewController splitViewItems] lastObject] setCollapsed:[notes 
count] == 0];
     
     // Due to a bug in Leopard we should only resize and swap in the PDFView 
after loading the PDFDocument
-    NSRect rect = [view bounds];
-    item = [[splitViewController splitViewItems] firstObject];
-    if ([item isCollapsed] == NO)
-        rect.size.width -= NSWidth([[[item viewController] view] frame]) + 
[[splitViewController splitView] dividerThickness];
-    item = [[splitViewController splitViewItems] lastObject];
-    if ([item isCollapsed] == NO)
-        rect.size.width -= NSWidth([[[item viewController] view] frame]) + 
[[splitViewController splitView] dividerThickness];
     
-    [pdfView setFrame:rect];
+    // Make sure we already get the correct size for the pdfView,
+    // so performFit: and going to a destination will calculate correctly
+    [[window contentView] layoutSubtreeIfNeeded];
     
+    [pdfView setFrame:[centerContentView bounds]];
+    
     pdfSplitViewController  = [[NSSplitViewController alloc] init];
     
     viewController = [[NSViewController alloc] init];
@@ -485,7 +482,7 @@
     [[pdfSplitViewController splitView] setVertical:NO];
     
     view = [pdfSplitViewController view];
-    [view setFrame:rect];
+    [view setFrame:[centerContentView bounds]];
     constraints = @[[[view leadingAnchor] 
constraintEqualToAnchor:[centerContentView leadingAnchor]],
         [[centerContentView trailingAnchor] constraintEqualToAnchor:[view 
trailingAnchor]],
         [[view topAnchor] constraintEqualToAnchor:[centerContentView 
topAnchor]],
@@ -513,12 +510,10 @@
         }
         
         // We can fit only after the PDF has been loaded
-        if (windowSizeOption == SKWindowOptionFit) {
-            [[window contentView] layoutSubtreeIfNeeded];
-            [self performFit:self];
-        } else if (windowSizeOption == SKWindowOptionMaximize) {
-            [window zoom:self];
-        }
+        if (windowSizeOption == SKWindowOptionFit)
+            [self performFit:nil];
+        else if (windowSizeOption == SKWindowOptionMaximize)
+            [window zoom:nil];
     }
     
     // Go to page?

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