Revision: 15111
http://sourceforge.net/p/skim-app/code/15111
Author: hofman
Date: 2025-04-11 09:25:16 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
There should be no need to invalidate toolbar items when running customization
palette
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKNotesDocument.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-04-10 17:28:07 UTC (rev 15110)
+++ trunk/SKMainToolbarController.m 2025-04-11 09:25:16 UTC (rev 15111)
@@ -963,9 +963,7 @@
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
NSString *identifier = [toolbarItem itemIdentifier];
- if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
- return NO;
- } else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
+ if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && ([mainController.pdfView autoScales] ||
fabs([mainController.pdfView scaleFactor] - 1.0) > 0.0);
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2025-04-10 17:28:07 UTC (rev 15110)
+++ trunk/SKNotesDocument.m 2025-04-11 09:25:16 UTC (rev 15111)
@@ -951,9 +951,7 @@
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
- if ([[[self window] toolbar] customizationPaletteIsRunning])
- return NO;
- else if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
+ if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
return [(sourceFileURL ?: [[self fileURL]
URLReplacingPathExtension:@"pdf"]) checkResourceIsReachableAndReturnError:NULL];
return 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
