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

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

Revision: 16215
          http://sourceforge.net/p/skim-app/code/16215
Author:   hofman
Date:     2026-05-04 15:51:25 +0000 (Mon, 04 May 2026)
Log Message:
-----------
remove undo auto size rows items from context menu when automatically resizing

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2026-05-04 14:16:18 UTC (rev 16214)
+++ trunk/SKMainWindowController_UI.m   2026-05-04 15:51:25 UTC (rev 16215)
@@ -1214,7 +1214,29 @@
     [page addAnnotation:note];
 }
 
+- (void)resetHeightOfNoteRows:(id)sender {
+    NSArray *items = [sender representedObject];
+    if (items == nil) {
+        [self resetNoteRowHeights];
+    } else {
+        SKNoteOutlineView *ov = rightSideController.noteOutlineView;
+        NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
+        for (id item in items) {
+            [rightSideController.noteOutlineView setRowHeight:0.0 
forItem:item];
+            NSInteger row = [ov rowForItem:item];
+            if (row != -1)
+                [indexes addIndex:row];
+        }
+        [ov noteHeightOfRowsWithIndexesChanged:indexes];
+    }
+}
+
 - (void)autoSizeNoteRows:(id)sender {
+    if (mwcFlags.autoResizeNoteRows) {
+        [self resetHeightOfNoteRows:sender];
+        return;
+    }
+    
     NSOutlineView *ov = rightSideController.noteOutlineView;
     CGFloat height = 0.0, rowHeight = [ov rowHeight];
     NSTableColumn *tableColumn = [ov outlineTableColumn];
@@ -1256,23 +1278,6 @@
     [ov noteHeightOfRowsWithIndexesChanged:rowIndexes ?: [NSIndexSet 
indexSetWithIndexesInRange:NSMakeRange(0, [ov numberOfRows])]];
 }
 
-- (void)resetHeightOfNoteRows:(id)sender {
-    NSArray *items = [sender representedObject];
-    if (items == nil) {
-        [self resetNoteRowHeights];
-    } else {
-        SKNoteOutlineView *ov = rightSideController.noteOutlineView;
-        NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
-        for (id item in items) {
-            [rightSideController.noteOutlineView setRowHeight:0.0 
forItem:item];
-            NSInteger row = [ov rowForItem:item];
-            if (row != -1)
-                [indexes addIndex:row];
-        }
-        [ov noteHeightOfRowsWithIndexesChanged:indexes];
-    }
-}
-
 - (void)toggleAutoResizeNoteRows:(id)sender {
     mwcFlags.autoResizeNoteRows = (0 == mwcFlags.autoResizeNoteRows);
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
@@ -1449,14 +1454,18 @@
                 [menu addItem:[NSMenuItem separatorItem]];
             item = [menu addItemWithTitle:[items count] == 1 ? 
NSLocalizedString(@"Auto Size Row", @"Menu item title") : 
NSLocalizedString(@"Auto Size Rows", @"Menu item title") 
action:@selector(autoSizeNoteRows:) target:self];
             [item setRepresentedObject:items];
-            item = [menu addItemWithTitle:[items count] == 1 ? 
NSLocalizedString(@"Undo Auto Size Row", @"Menu item title") : 
NSLocalizedString(@"Undo Auto Size Rows", @"Menu item title") 
action:@selector(resetHeightOfNoteRows:) target:self];
-            [item setRepresentedObject:items];
-            [item setKeyEquivalentModifierMask:NSEventModifierFlagOption];
-            [item setAlternate:YES];
+            if (mwcFlags.autoResizeNoteRows == NO) {
+                item = [menu addItemWithTitle:[items count] == 1 ? 
NSLocalizedString(@"Undo Auto Size Row", @"Menu item title") : 
NSLocalizedString(@"Undo Auto Size Rows", @"Menu item title") 
action:@selector(resetHeightOfNoteRows:) target:self];
+                [item setRepresentedObject:items];
+                [item setKeyEquivalentModifierMask:NSEventModifierFlagOption];
+                [item setAlternate:YES];
+            }
             [menu addItemWithTitle:NSLocalizedString(@"Auto Size All", @"Menu 
item title") action:@selector(autoSizeNoteRows:) target:self];
-            item = [menu addItemWithTitle:NSLocalizedString(@"Undo Auto Size 
All", @"Menu item title") action:@selector(resetHeightOfNoteRows:) target:self];
-            [item setKeyEquivalentModifierMask:NSEventModifierFlagOption];
-            [item setAlternate:YES];
+            if (mwcFlags.autoResizeNoteRows == NO) {
+                item = [menu addItemWithTitle:NSLocalizedString(@"Undo Auto 
Size All", @"Menu item title") action:@selector(resetHeightOfNoteRows:) 
target:self];
+                [item setKeyEquivalentModifierMask:NSEventModifierFlagOption];
+                [item setAlternate:YES];
+            }
             [menu addItemWithTitle:NSLocalizedString(@"Automatically Resize", 
@"Menu item title") action:@selector(toggleAutoResizeNoteRows:) target:self];
         }
     }

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