Revision: 14988
http://sourceforge.net/p/skim-app/code/14988
Author: hofman
Date: 2025-03-18 16:58:38 +0000 (Tue, 18 Mar 2025)
Log Message:
-----------
Enable toolbar small size for compact toolbar, otherwise the customization
palette is messed up
Modified Paths:
--------------
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-03-18 16:21:23 UTC (rev 14987)
+++ trunk/SKMainToolbarController.m 2025-03-18 16:58:38 UTC (rev 14988)
@@ -117,6 +117,8 @@
#define SKDocumentToolbarPrintItemIdentifier
@"SKDocumentToolbarPrintItemIdentifier"
#define SKDocumentToolbarCustomizeItemIdentifier
@"SKDocumentToolbarCustomizeItemIdentifier"
+#define SKToolbarPlacementKey @"SKToolbarPlacement"
+
static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu",
@"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu",
@"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu",
@"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
static NSString *addNoteToolImageNames[] = {@"ToolbarAddTextNoteMenu",
@"ToolbarAddAnchoredNoteMenu", @"ToolbarAddCircleNoteMenu",
@"ToolbarAddSquareNoteMenu", @"ToolbarAddHighlightNoteMenu",
@"ToolbarAddUnderlineNoteMenu", @"ToolbarAddStrikeOutNoteMenu",
@"ToolbarAddLineNoteMenu", @"ToolbarAddInkNoteMenu"};
@@ -166,7 +168,11 @@
[self view];
// Create a new toolbar instance, and attach it to our document window
- NSToolbar *toolbar = [[SKToolbar alloc]
initWithIdentifier:SKDocumentToolbarIdentifier];
+ NSToolbar *toolbar;
+ if (([[NSUserDefaults standardUserDefaults]
integerForKey:SKToolbarPlacementKey] & 1))
+ toolbar = [[NSToolbar alloc]
initWithIdentifier:SKDocumentToolbarIdentifier];
+ else
+ toolbar = [[SKToolbar alloc]
initWithIdentifier:SKDocumentToolbarIdentifier];
// Set up toolbar properties: Allow customization, give a default display
mode, and remember state in user defaults
[toolbar setAllowsUserCustomization:YES];
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
