Revision: 16136
http://sourceforge.net/p/skim-app/code/16136
Author: hofman
Date: 2026-03-31 22:21:23 +0000 (Tue, 31 Mar 2026)
Log Message:
-----------
fix validation of note touch bar button
Modified Paths:
--------------
trunk/SKMainTouchBarController.h
trunk/SKMainTouchBarController.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/SKMainTouchBarController.h
===================================================================
--- trunk/SKMainTouchBarController.h 2026-03-31 18:33:21 UTC (rev 16135)
+++ trunk/SKMainTouchBarController.h 2026-03-31 22:21:23 UTC (rev 16136)
@@ -64,6 +64,7 @@
- (void)handleToolModeChangedNotification:(nullable NSNotification
*)notification;
- (void)interactionModeChanged;
- (void)overviewChanged;
+- (void)canSelectNoteChanged;
@end
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2026-03-31 18:33:21 UTC (rev 16135)
+++ trunk/SKMainTouchBarController.m 2026-03-31 22:21:23 UTC (rev 16136)
@@ -372,7 +372,6 @@
- (void)handleToolModeChangedNotification:(NSNotification *)notification {
[toolModeButton selectSegmentWithTag:[mainController.pdfView toolMode]];
- [noteButton setEnabled:[mainController.pdfView canSelectNote]];
if ([mainController.pdfView toolMode] == SKToolModeNote) {
[annotationModeButton selectSegmentWithTag:[mainController.pdfView
annotationMode]];
} else {
@@ -435,11 +434,15 @@
BOOL enabled = [mainController interactionMode] != SKPresentationMode &&
showPDF;
[toolModeButton setEnabled:enabled];
[annotationModeButton setEnabled:enabled];
- [noteButton setEnabled:enabled];
+ [noteButton setEnabled:enabled && [mainController.pdfView canSelectNote]];
[zoomInActualOutButton setEnabled:showPDF];
}
+- (void)canSelectNoteChanged {
+ [noteButton setEnabled:[mainController interactionMode] !=
SKPresentationMode && [mainController hasOverview] == NO &&
[mainController.pdfView canSelectNote]];
+}
+
- (void)registerForNotifications {
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2026-03-31 18:33:21 UTC (rev
16135)
+++ trunk/SKMainWindowController_Actions.m 2026-03-31 22:21:23 UTC (rev
16136)
@@ -283,7 +283,7 @@
if ([pdfView hideNotes] == NO)
[pdfView setCurrentAnnotation:nil];
[pdfView setHideNotes:[pdfView hideNotes] == NO];
- [touchBarController handleToolModeChangedNotification:nil];
+ [touchBarController canSelectNoteChanged];
[noteToolbarController validateButtons];
}
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
