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

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

Revision: 14962
          http://sourceforge.net/p/skim-app/code/14962
Author:   hofman
Date:     2025-03-11 15:12:56 +0000 (Tue, 11 Mar 2025)
Log Message:
-----------
Interpret beside + replacing title bits in hidden pref to hide title for tab bar

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2025-03-11 10:27:36 UTC (rev 14961)
+++ trunk/SKMainWindowController.m      2025-03-11 15:12:56 UTC (rev 14962)
@@ -330,16 +330,18 @@
     
     // Set up the window
     
-    // hidden pref for toolbar position relative to title:
-    // 0 = below, 1 = compact, 2 = beside, 3 = beside compact, 4 = replacing, 
5 = replacing compact
+    enum { SKTBCompact = 1, SKTBBesideTitle = 2, SKTBReplacingTitle = 4, 
SKTBTabsReplacingTitle = 6};
+    // hidden pref for toolbar position relative to title, 0-7
     NSInteger placement = [[NSUserDefaults standardUserDefaults] 
integerForKey:SKToolbarPlacementKey];
     if (@available(macOS 11.0, *)) {
-        [window setToolbarStyle:placement == 0 ? NSWindowToolbarStyleExpanded 
: (placement & 1) ? NSWindowToolbarStyleUnifiedCompact : 
NSWindowToolbarStyleUnified];
+        [window setToolbarStyle:placement <= SKTBCompact ? 
NSWindowToolbarStyleExpanded : (placement & SKTBCompact) ? 
NSWindowToolbarStyleUnifiedCompact : NSWindowToolbarStyleUnified];
+        if (placement == SKTBCompact)
+            [[window toolbar] setDisplayMode:NSToolbarDisplayModeIconOnly];
+    } else if ((placement & SKTBCompact)) {
+        [[window toolbar] setDisplayMode:NSToolbarDisplayModeIconOnly];
     }
-    if (placement == 1)
-        [(SKMainWindow *)window 
setAutoTitleVisibility:SKWindowTitleHiddenForTabBar];
-    else if (placement > 3)
-        [(SKMainWindow *)window 
setAutoTitleVisibility:SKWindowTitleHiddenForToolbar];
+    if ((placement & SKTBReplacingTitle))
+        [(SKMainWindow *)window setAutoTitleVisibility:(placement & 
SKTBBesideTitle) ? SKWindowTitleHiddenForTabBar : 
SKWindowTitleHiddenForToolbar];
     
     // for animations
     [[window contentView] setWantsLayer:YES];

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