[Skim-app-commit] SF.net SVN: skim-app:[14951] trunk

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

Revision: 14951
          http://sourceforge.net/p/skim-app/code/14951
Author:   hofman
Date:     2025-03-07 22:22:01 +0000 (Fri, 07 Mar 2025)
Log Message:
-----------
Add two hidden pref options for toolbar placement with compact unified toolbar

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

Modified: trunk/SKMainWindow.m
===================================================================
--- trunk/SKMainWindow.m        2025-03-07 17:24:59 UTC (rev 14950)
+++ trunk/SKMainWindow.m        2025-03-07 22:22:01 UTC (rev 14951)
@@ -124,7 +124,7 @@
 
 - (void)toggleToolbarShown:(id)sender {
     if (@available(macOS 11.0, *)) {
-        if ([[NSUserDefaults standardUserDefaults] 
integerForKey:SKToolbarPlacementKey] == 2)
+        if ([[NSUserDefaults standardUserDefaults] 
integerForKey:SKToolbarPlacementKey] > 2)
             [self setTitleVisibility:[[self toolbar] isVisible] ? 
NSWindowTitleVisible : NSWindowTitleHidden];
     }
     [super toggleToolbarShown:sender];

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2025-03-07 17:24:59 UTC (rev 14950)
+++ trunk/SKMainWindowController.m      2025-03-07 22:22:01 UTC (rev 14951)
@@ -329,14 +329,21 @@
     // Set up the window
     
     if (@available(macOS 11.0, *)) {
-        // hidden pref: 0 = below title, 1 = beside title, 2 = replacing title
+        // hidden pref for toolbar position relative to title:
+        // 0 = below, 1 = beside, 2 = beside compact, 3 = replacing, 4 = 
replacing compact
         NSInteger placement = [[NSUserDefaults standardUserDefaults] 
integerForKey:SKToolbarPlacementKey];
         if (placement == 0) {
             [window setToolbarStyle:NSWindowToolbarStyleExpanded];
-        } else if (placement == 2) {
+        } else  if (placement == 2) {
+            [window setToolbarStyle:NSWindowToolbarStyleUnifiedCompact];
+        } else if (placement == 3) {
             [window setToolbarStyle:NSWindowToolbarStyleUnified];
             if ([[window toolbar] isVisible])
                 [window setTitleVisibility:NSWindowTitleHidden];
+        } else if (placement == 4) {
+            [window setToolbarStyle:NSWindowToolbarStyleUnifiedCompact];
+            if ([[window toolbar] isVisible])
+                [window setTitleVisibility:NSWindowTitleHidden];
         }
     }
     

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