Revision: 14948
http://sourceforge.net/p/skim-app/code/14948
Author: hofman
Date: 2025-03-07 17:08:28 +0000 (Fri, 07 Mar 2025)
Log Message:
-----------
Add a hidden preference for the placement of the toolbar: below, beside, or
replacing the title
Modified Paths:
--------------
trunk/SKMainWindow.m
trunk/SKMainWindowController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/SKMainWindow.m
===================================================================
--- trunk/SKMainWindow.m 2025-03-07 09:59:13 UTC (rev 14947)
+++ trunk/SKMainWindow.m 2025-03-07 17:08:28 UTC (rev 14948)
@@ -40,6 +40,7 @@
#import "SKImageToolTipWindow.h"
#import "NSResponder_SKExtensions.h"
#import "NSEvent_SKExtensions.h"
+#import "SKStringConstants.h"
@implementation SKMainWindow
@@ -121,4 +122,10 @@
[super setDelegate:newDelegate];
}
+- (void)toggleToolbarShown:(id)sender {
+ if ([[NSUserDefaults standardUserDefaults]
integerForKey:SKToolbarPlacementKey] == 2)
+ [self setTitleVisibility:[[self toolbar] isVisible] ?
NSWindowTitleVisible : NSWindowTitleHidden];
+ [super toggleToolbarShown:sender];
+}
+
@end
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-03-07 09:59:13 UTC (rev 14947)
+++ trunk/SKMainWindowController.m 2025-03-07 17:08:28 UTC (rev 14948)
@@ -328,8 +328,17 @@
// Set up the window
- if (@available(macOS 11.0, *))
- [window setToolbarStyle:NSWindowToolbarStyleExpanded];
+ if (@available(macOS 11.0, *)) {
+ // hidden pref: 0 = expanded, 1 = unified, 2 = title hidden
+ NSInteger placement = [[NSUserDefaults standardUserDefaults]
integerForKey:SKToolbarPlacementKey];
+ if (placement == 0) {
+ [window setToolbarStyle:NSWindowToolbarStyleExpanded];
+ } else if (placement == 2) {
+ [window setToolbarStyle:NSWindowToolbarStyleUnified];
+ if ([[window toolbar] isVisible])
+ [window setTitleVisibility:NSWindowTitleHidden];
+ }
+ }
// for animations
[[window contentView] setWantsLayer:YES];
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2025-03-07 09:59:13 UTC (rev 14947)
+++ trunk/SKStringConstants.h 2025-03-07 17:08:28 UTC (rev 14948)
@@ -149,5 +149,6 @@
extern NSString *SKSepiaToneKey;
extern NSString *SKWhitePointKey;
extern NSString *SKPresentationInkNoteColorKey;
+extern NSString *SKToolbarPlacementKey;
NS_ASSUME_NONNULL_END
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2025-03-07 09:59:13 UTC (rev 14947)
+++ trunk/SKStringConstants.m 2025-03-07 17:08:28 UTC (rev 14948)
@@ -149,3 +149,4 @@
NSString *SKSepiaToneKey = @"SKSepiaTone";
NSString *SKWhitePointKey = @"SKWhitePoint";
NSString *SKPresentationInkNoteColorKey = @"SKPresentationInkNoteColor";
+NSString *SKToolbarPlacementKey = @"SKToolbarPlacement";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
