[Skim-app-commit] SF.net SVN: skim-app:[16221] trunk/SKMainWindowContro ller_UI.m

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

Revision: 16221
          http://sourceforge.net/p/skim-app/code/16221
Author:   hofman
Date:     2026-05-05 14:23:20 +0000 (Tue, 05 May 2026)
Log Message:
-----------
chec whether to add menu items first

Modified Paths:
--------------
    trunk/SKMainWindowController_UI.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2026-05-05 14:18:17 UTC (rev 16220)
+++ trunk/SKMainWindowController_UI.m   2026-05-05 14:23:20 UTC (rev 16221)
@@ -1312,7 +1312,7 @@
         }
     } else if ([menu isEqual:[leftSideController.findTableView menu]]) {
         NSInteger row = [leftSideController.findTableView clickedRow];
-        if (row > 0) {
+        if (row > 0 && ([pdfView toolMode] == SKToolModeText || [pdfView 
canAddNotes])) {
             NSIndexSet *rowIndexes = [leftSideController.findTableView 
selectedRowIndexes];
             if ([rowIndexes containsIndex:row] == NO)
                 rowIndexes = [NSIndexSet indexSetWithIndex:row];
@@ -1333,9 +1333,8 @@
                 item = [menu addItemWithTitle:NSLocalizedString(@"New Strike 
Out", @"Menu item title") action:@selector(addAnnotationForContext:) 
target:pdfView tag:SKNoteTypeStrikeOut];
                 [item setRepresentedObject:selections];
             }
+            [menu addItem:[NSMenuItem separatorItem]];
         }
-        if ([menu numberOfItems] > 0)
-            [menu addItem:[NSMenuItem separatorItem]];
         item = [menu addItemWithTitle:NSLocalizedString(@"Highlight Selected", 
@"Menu item title") action:@selector(changeSearchResultsHighlighting:) 
target:self tag:0];
         if (mwcFlags.highlightAllSearchResults == 0)
             [item setState:NSControlStateValueOn];
@@ -1344,7 +1343,7 @@
             [item setState:NSControlStateValueOn];
     } else if ([menu isEqual:[leftSideController.groupedFindTableView menu]]) {
         NSInteger row = [leftSideController.groupedFindTableView clickedRow];
-        if (row > 0) {
+        if (row > 0 && ([pdfView toolMode] == SKToolModeText || [pdfView 
canAddNotes])) {
             NSIndexSet *rowIndexes = [leftSideController.groupedFindTableView 
selectedRowIndexes];
             if ([rowIndexes containsIndex:row] == NO)
                 rowIndexes = [NSIndexSet indexSetWithIndex:row];
@@ -1365,9 +1364,8 @@
                 item = [menu addItemWithTitle:NSLocalizedString(@"New Strike 
Out", @"Menu item title") action:@selector(addAnnotationForContext:) 
target:pdfView tag:SKNoteTypeStrikeOut];
                 [item setRepresentedObject:selections];
             }
+            [menu addItem:[NSMenuItem separatorItem]];
         }
-        if ([menu numberOfItems] > 0)
-            [menu addItem:[NSMenuItem separatorItem]];
         item = [menu addItemWithTitle:NSLocalizedString(@"Highlight Selected", 
@"Menu item title") action:@selector(changeSearchResultsHighlighting:) 
target:self tag:0];
         if (mwcFlags.highlightAllSearchResults == 0)
             [item setState:NSControlStateValueOn];

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