skim-app-commit — This tracks source code changes in Subversion.

[Skim-app-commit] SF.net SVN: skim-app:[16294] trunk/SKNoteOutlineView .m

[<ho...@us...>]

Revision: 16294
          http://sourceforge.net/p/skim-app/code/16294
Author:   hofman
Date:     2026-05-14 16:33:34 +0000 (Thu, 14 May 2026)
Log Message:
-----------
replace method bby static function

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

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-13 09:10:09 UTC (rev 16293)
+++ trunk/SKNoteOutlineView.m	2026-05-14 16:33:34 UTC (rev 16294)
@@ -187,10 +187,10 @@
     }
 }
 
-- (BOOL)outlineColumnIsFirst {
-    for (NSTableColumn *tc in [self tableColumns]) {
+static inline BOOL isFirstTableColumn(NSTableColumn *tableColumn, NSArray *tableColumns) {
+    for (NSTableColumn *tc in tableColumns) {
         if ([tc isHidden] == NO)
-            return tc == [self outlineTableColumn];
+            return tc == tableColumn;
     }
     return NO;
 }
@@ -205,7 +205,7 @@
                 frame = NSUnionRect(frame, [super frameOfCellAtColumn:column row:row]);
         }
         NSInteger level = [self levelForRow:row];
-        if (level > 0 && [self outlineColumnIsFirst])
+        if (level > 0 && isFirstTableColumn([self outlineTableColumn], tcs))
             frame = SKShrinkRect(frame, -[self indentationPerLevel] * level, NSRectEdgeMinX);
         return frame;
     }
@@ -236,7 +236,7 @@
     if (@available(macOS 11.0, *)) {
         if ([self effectiveStyle] == NSTableViewStylePlain)
             return 18.0;
-        else if ([self outlineColumnIsFirst])
+        else if (isFirstTableColumn([self outlineTableColumn], [self tableColumns]))
             return 9.0;
         else
             return 15.0 - floor(0.5 * [self intercellSpacing].width);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16292] trunk

[<ho...@us...>]

Revision: 16292
          http://sourceforge.net/p/skim-app/code/16292
Author:   hofman
Date:     2026-05-12 22:08:01 +0000 (Tue, 12 May 2026)
Log Message:
-----------
use NSTableViewRowViewKey for rowview so it will e used automatically

Modified Paths:
--------------
    trunk/NotesDocument.xib
    trunk/SKNotesDocument.m

Modified: trunk/NotesDocument.xib
===================================================================
--- trunk/NotesDocument.xib	2026-05-12 21:50:11 UTC (rev 16291)
+++ trunk/NotesDocument.xib	2026-05-12 22:08:01 UTC (rev 16292)
@@ -56,7 +56,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
-                                                <customView identifier="row" id="yvn-lZ-y0P" customClass="SKNoteTableRowView">
+                                                <customView identifier="NSTableViewRowViewKey" id="yvn-lZ-y0P" customClass="SKNoteTableRowView">
                                                     <rect key="frame" x="11" y="1" width="389" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </customView>

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m	2026-05-12 21:50:11 UTC (rev 16291)
+++ trunk/SKNotesDocument.m	2026-05-12 22:08:01 UTC (rev 16292)
@@ -92,8 +92,6 @@
 #define AUTHOR_COLUMNID @"author"
 #define DATE_COLUMNID   @"date"
 
-#define ROWVIEW_IDENTIFIER @"row"
-
 #define STATUSBAR_HEIGHT 22.0
 
 #define EXTRA_ROW_HEIGHT 2.0
@@ -692,10 +690,6 @@
     return nil;
 }
 
-- (NSTableRowView *)outlineView:(NSOutlineView *)ov rowViewForItem:(id)item {
-    return [ov makeViewWithIdentifier:ROWVIEW_IDENTIFIER owner:self];
-}
-
 - (void)outlineView:(NSOutlineView *)ov didClickTableColumn:(NSTableColumn *)tableColumn {
     NSTableColumn *oldTableColumn = [ov highlightedTableColumn];
     NSTableColumn *newTableColumn = ([NSEvent modifierFlags] & NSEventModifierFlagCommand) ? nil : [ov highlightedTableColumn];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16291
          http://sourceforge.net/p/skim-app/code/16291
Author:   hofman
Date:     2026-05-12 21:50:11 +0000 (Tue, 12 May 2026)
Log Message:
-----------
correct rowheight offset

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-12 15:29:16 UTC (rev 16290)
+++ trunk/SKMainWindowController_UI.m	2026-05-12 21:50:11 UTC (rev 16291)
@@ -614,7 +614,7 @@
         NSTextFieldCell *cell = [tc dataCell];
         [cell setObjectValue:[[[leftSideController.findArrayController arrangedObjects] objectAtIndex:row] contextString]];
         CGFloat height = [cell cellSizeForBounds:NSMakeRect(0.0, 0.0, [tc width], CGFLOAT_MAX)].height;
-        if (height > MAX_FIND_LINES * (rowHeight - 3.0))
+        if (height > MAX_FIND_LINES * (rowHeight - 5.0))
             height = fmin(height, MAX_FIND_LINES * [cell cellSizeForBounds:NSMakeRect(0.0, 0.0, CGFLOAT_MAX, CGFLOAT_MAX)].height);
         return fmax(rowHeight, height + EXTRA_FIND_ROW_HEIGHT);
     } else if ([tv isEqual:leftSideController.groupedFindTableView]) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16290] trunk/SKNoteOutlineView .m

[<ho...@us...>]

Revision: 16290
          http://sourceforge.net/p/skim-app/code/16290
Author:   hofman
Date:     2026-05-12 15:29:16 +0000 (Tue, 12 May 2026)
Log Message:
-----------
create rowHeights mapTable lazily

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

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-12 14:54:52 UTC (rev 16289)
+++ trunk/SKNoteOutlineView.m	2026-05-12 15:29:16 UTC (rev 16290)
@@ -97,21 +97,22 @@
         }
         
         [[self headerView] setMenu:menu];
-        
-        rowHeights = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory | NSPointerFunctionsObjectPersonality valueOptions:NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality capacity:0];
     }
     return self;
 }
 
 - (CGFloat)rowHeightForItem:(id)item {
-    return (NSInteger)NSMapGet(rowHeights, (__bridge void *)item);
+    return rowHeights ? (NSInteger)NSMapGet(rowHeights, (__bridge void *)item) : 0.0;
 }
 
 - (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item {
-    if (rowHeight > 0.0)
+    if (rowHeight > 0.0) {
+        if (rowHeights == nil)
+            rowHeights = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory | NSPointerFunctionsObjectPersonality valueOptions:NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality capacity:0];
         NSMapInsert(rowHeights, (__bridge void *)item, (void *)(NSInteger)rowHeight);
-    else
+    } else if (rowHeights) {
         NSMapRemove(rowHeights, (__bridge void *)item);
+    }
 }
 
 - (void)resetRowHeights {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16289] trunk

[<ho...@us...>]

Revision: 16289
          http://sourceforge.net/p/skim-app/code/16289
Author:   hofman
Date:     2026-05-12 14:54:52 +0000 (Tue, 12 May 2026)
Log Message:
-----------
always reset rowheights for note outlineview when changing font

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKOutlineView.h
    trunk/SKOutlineView.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2026-05-12 14:36:08 UTC (rev 16288)
+++ trunk/SKMainWindowController.m	2026-05-12 14:54:52 UTC (rev 16289)
@@ -839,8 +839,6 @@
 
 - (void)updateTableFont {
     NSFont *font = [NSFont systemFontOfSize:[[NSUserDefaults standardUserDefaults] floatForKey:SKTableFontSizeKey]];
-    if (mwcFlags.autoResizeNoteRows)
-        [rightSideController.noteOutlineView resetRowHeights];
     [leftSideController.tocOutlineView setFont:font];
     [rightSideController.noteOutlineView setFont:font];
     [leftSideController.findTableView setFont:font];

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h	2026-05-12 14:36:08 UTC (rev 16288)
+++ trunk/SKNoteOutlineView.h	2026-05-12 14:54:52 UTC (rev 16289)
@@ -56,7 +56,6 @@
 - (CGFloat)rowHeightForItem:(id)item;
 - (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item;
 - (void)resetRowHeights;
-- (void)noteHeightOfRowsChanged;
 
 @end
 

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-12 14:36:08 UTC (rev 16288)
+++ trunk/SKNoteOutlineView.m	2026-05-12 14:54:52 UTC (rev 16289)
@@ -120,7 +120,7 @@
 
 - (void)noteHeightOfRowsChanged {
     [rowHeights removeAllObjects];
-    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
+    [super noteHeightOfRowsChanged];
 }
 
 - (void)mouseDown:(NSEvent *)theEvent {

Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h	2026-05-12 14:36:08 UTC (rev 16288)
+++ trunk/SKOutlineView.h	2026-05-12 14:54:52 UTC (rev 16289)
@@ -82,6 +82,8 @@
 
 - (void)reloadTypeSelectStrings;
 
+- (void)noteHeightOfRowsChanged;
+
 @property (nullable, weak) id<SKOutlineViewDelegate> delegate;
 
 @end

Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m	2026-05-12 14:36:08 UTC (rev 16288)
+++ trunk/SKOutlineView.m	2026-05-12 14:54:52 UTC (rev 16289)
@@ -235,7 +235,7 @@
                     [[view textField] setFont:newFont];
             }
         }];
-        [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
+        [self noteHeightOfRowsChanged];
     }
 }
 
@@ -250,6 +250,10 @@
     return view;
 }
 
+- (void)noteHeightOfRowsChanged {
+    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
+}
+
 - (void)viewDidMoveToWindow {
     [super viewDidMoveToWindow];
     if ([self window] == nil)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16288] trunk

[<ho...@us...>]

Revision: 16288
          http://sourceforge.net/p/skim-app/code/16288
Author:   hofman
Date:     2026-05-12 14:36:08 +0000 (Tue, 12 May 2026)
Log Message:
-----------
Rename method. Reset row height when changing font of notet outlineview when autoresizing row heights

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKNotesDocument.m
    trunk/SKTableView.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKMainWindowController.m	2026-05-12 14:36:08 UTC (rev 16288)
@@ -839,6 +839,8 @@
 
 - (void)updateTableFont {
     NSFont *font = [NSFont systemFontOfSize:[[NSUserDefaults standardUserDefaults] floatForKey:SKTableFontSizeKey]];
+    if (mwcFlags.autoResizeNoteRows)
+        [rightSideController.noteOutlineView resetRowHeights];
     [leftSideController.tocOutlineView setFont:font];
     [rightSideController.noteOutlineView setFont:font];
     [leftSideController.findTableView setFont:font];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKMainWindowController_UI.m	2026-05-12 14:36:08 UTC (rev 16288)
@@ -952,7 +952,7 @@
     
     if (mwcFlags.autoResizeNoteRows && [[notification object] isEqual:rightSideController.noteOutlineView] &&
         [(SKScrollView *)[rightSideController.noteOutlineView enclosingScrollView] isResizingSubviews] == NO)
-        [rightSideController.noteOutlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
+        [rightSideController.noteOutlineView performSelectorOnce:@selector(noteHeightOfRowsChanged) afterDelay:0.0];
 }
 
 - (void)outlineViewColumnDidMove:(NSNotification *)notification {
@@ -967,7 +967,7 @@
                 break;
         }
         if (oldColumn == firstColumn || newColumn == firstColumn)
-            [rightSideController.noteOutlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
+            [rightSideController.noteOutlineView performSelectorOnce:@selector(noteHeightOfRowsChanged) afterDelay:0.0];
     }
 }
 
@@ -1266,7 +1266,7 @@
 - (void)resetHeightOfNoteRows:(id)sender {
     NSArray *items = [sender representedObject];
     if (items == nil) {
-        [rightSideController.noteOutlineView updateRowHeights];
+        [rightSideController.noteOutlineView noteHeightOfRowsChanged];
     } else {
         SKNoteOutlineView *ov = rightSideController.noteOutlineView;
         NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
@@ -1332,7 +1332,7 @@
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     NSView *view = [rightSideController.noteOutlineView enclosingScrollView];
     if (mwcFlags.autoResizeNoteRows) {
-        [rightSideController.noteOutlineView updateRowHeights];
+        [rightSideController.noteOutlineView noteHeightOfRowsChanged];
         [nc addObserver:self selector:@selector(handleNoteViewFrameDidChangeNotification:)
  name:NSViewFrameDidChangeNotification object:view];
         [nc addObserver:self selector:@selector(handleNoteViewDidEndLiveResizeNotification:)
@@ -2076,7 +2076,7 @@
         } else {
             [NSAnimationContext beginGrouping];
             [[NSAnimationContext currentContext] setDuration:0.0];
-            [rightSideController.noteOutlineView updateRowHeights];
+            [rightSideController.noteOutlineView noteHeightOfRowsChanged];
             [NSAnimationContext beginGrouping];
         }
     }
@@ -2084,7 +2084,7 @@
 
 - (void)handleNoteViewDidEndLiveResizeNotification:(NSNotification *)notification {
     if (mwcFlags.noteRowHeightsNeedUpdate && mwcFlags.autoResizeNoteRows) {
-        [rightSideController.noteOutlineView updateRowHeights];
+        [rightSideController.noteOutlineView noteHeightOfRowsChanged];
     }
 }
 

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKNoteOutlineView.h	2026-05-12 14:36:08 UTC (rev 16288)
@@ -56,7 +56,7 @@
 - (CGFloat)rowHeightForItem:(id)item;
 - (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item;
 - (void)resetRowHeights;
-- (void)updateRowHeights;
+- (void)noteHeightOfRowsChanged;
 
 @end
 

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKNoteOutlineView.m	2026-05-12 14:36:08 UTC (rev 16288)
@@ -118,7 +118,7 @@
     [rowHeights removeAllObjects];
 }
 
-- (void)updateRowHeights {
+- (void)noteHeightOfRowsChanged {
     [rowHeights removeAllObjects];
     [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
 }

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKNotesDocument.m	2026-05-12 14:36:08 UTC (rev 16288)
@@ -555,7 +555,7 @@
 - (void)resetHeightOfNoteRows:(id)sender {
     NSArray *items = [sender representedObject];
     if (items == nil) {
-        [outlineView updateRowHeights];
+        [outlineView noteHeightOfRowsChanged];
     } else {
         NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
         for (id item in items) {
@@ -572,7 +572,7 @@
     if (ndFlags.autoResizeRows && [[notification object] inLiveResize] == NO) {
         [NSAnimationContext beginGrouping];
         [[NSAnimationContext currentContext] setDuration:0.0];
-        [outlineView updateRowHeights];
+        [outlineView noteHeightOfRowsChanged];
         [NSAnimationContext endGrouping];
     }
 }
@@ -579,7 +579,7 @@
 
 - (void)handleScrollViewDidEndLiveResizeNotification:(NSNotification *)notification {
     if (ndFlags.autoResizeRows) {
-        [outlineView updateRowHeights];
+        [outlineView noteHeightOfRowsChanged];
     }
 }
 
@@ -588,7 +588,7 @@
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     NSView *view = [outlineView enclosingScrollView];
     if (ndFlags.autoResizeRows) {
-        [outlineView updateRowHeights];
+        [outlineView noteHeightOfRowsChanged];
         [nc addObserver:self selector:@selector(handleScrollViewFrameDidChangeNotification:)
  name:NSViewFrameDidChangeNotification object:view];
         [nc addObserver:self selector:@selector(handleScrollViewDidEndLiveResizeNotification:)
@@ -737,7 +737,7 @@
 
 - (void)outlineViewColumnDidResize:(NSNotification *)notification{
     if (ndFlags.autoResizeRows && [(SKScrollView *)[[notification object] enclosingScrollView] isResizingSubviews] == NO)
-        [outlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
+        [outlineView performSelectorOnce:@selector(noteHeightOfRowsChanged) afterDelay:0.0];
 }
 
 - (void)outlineViewColumnDidMove:(NSNotification *)notification {
@@ -752,7 +752,7 @@
                 break;
         }
         if (oldColumn == firstColumn || newColumn == firstColumn)
-            [outlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
+            [outlineView performSelectorOnce:@selector(noteHeightOfRowsChanged) afterDelay:0.0];
     }
 }
 

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m	2026-05-12 09:25:06 UTC (rev 16287)
+++ trunk/SKTableView.m	2026-05-12 14:36:08 UTC (rev 16288)
@@ -231,7 +231,7 @@
                     [[view textField] setFont:newFont];
             }
         }];
-        [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
+        [self noteHeightOfRowsChanged];
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16287] trunk

[<ho...@us...>]

Revision: 16287
          http://sourceforge.net/p/skim-app/code/16287
Author:   hofman
Date:     2026-05-12 09:25:06 +0000 (Tue, 12 May 2026)
Log Message:
-----------
don't use as much convenience method to note rowheight changes for more specific application

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m
    trunk/SKTableView.h
    trunk/SKTableView.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2026-05-11 21:34:00 UTC (rev 16286)
+++ trunk/SKMainWindowController.m	2026-05-12 09:25:06 UTC (rev 16287)
@@ -2653,10 +2653,10 @@
             }
         } else if ([keyPath isEqualToString:SKThumbnailSizeKey]) {
             [self resetThumbnailSizeIfNeeded];
-            [leftSideController.thumbnailTableView noteHeightOfRowsChangedAnimating:YES];
+            [leftSideController.thumbnailTableView noteHeightOfRowsChanged];
         } else if ([keyPath isEqualToString:SKSnapshotThumbnailSizeKey]) {
             [self resetSnapshotSizeIfNeeded];
-            [rightSideController.snapshotTableView noteHeightOfRowsChangedAnimating:YES];
+            [rightSideController.snapshotTableView noteHeightOfRowsChanged];
         } else if ([keyPath isEqualToString:SKInterpolationQualityKey]) {
             [pdfView setInterpolationQuality:[[NSUserDefaults standardUserDefaults] integerForKey:SKInterpolationQualityKey]];
             [secondaryPdfView setInterpolationQuality:[[NSUserDefaults standardUserDefaults] integerForKey:SKInterpolationQualityKey]];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-11 21:34:00 UTC (rev 16286)
+++ trunk/SKMainWindowController_UI.m	2026-05-12 09:25:06 UTC (rev 16287)
@@ -570,15 +570,22 @@
     if ([tcID isEqualToString:IMAGE_COLUMNID]) {
         SKTableView *tv = [aNotification object];
         if ([tv isEqual:leftSideController.thumbnailTableView] || [tv isEqual:rightSideController.snapshotTableView]) {
-            [tv noteHeightOfRowsChangedAnimating:NO];
+            [NSAnimationContext beginGrouping];
+            [[NSAnimationContext currentContext] setDuration:0.0];
+            [tv noteHeightOfRowsChanged];
+            [NSAnimationContext endGrouping];
         }
     } else if ([tcID isEqualToString:RESULTS_COLUMNID]) {
         SKTableView *tv = [aNotification object];
-        if ([tv isEqual:leftSideController.findTableView]) {
-            if ([tv inLiveResize])
+        if ([tv isEqual:leftSideController.findTableView] && [tv numberOfRows] > 1) {
+            if ([tv inLiveResize]) {
                 mwcFlags.findRowHeightsNeedUpdate = YES;
-            else
-                [tv noteHeightOfRowsChangedAnimating:NO];
+            } else {
+                [NSAnimationContext beginGrouping];
+                [[NSAnimationContext currentContext] setDuration:0.0];
+                [tv noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(1, [tv numberOfRows] - 1)]];
+                [NSAnimationContext endGrouping];
+            }
         }
     }
 }

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h	2026-05-11 21:34:00 UTC (rev 16286)
+++ trunk/SKTableView.h	2026-05-12 09:25:06 UTC (rev 16287)
@@ -98,7 +98,7 @@
 
 - (void)reloadTypeSelectStrings;
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate;
+- (void)noteHeightOfRowsChanged;
 
 @property (nullable, weak) id<SKTableViewDelegate> delegate;
 

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m	2026-05-11 21:34:00 UTC (rev 16286)
+++ trunk/SKTableView.m	2026-05-12 09:25:06 UTC (rev 16287)
@@ -246,15 +246,8 @@
     return view;
 }
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate {
-    if (animate == NO) {
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration:0.0];
-    }
+- (void)noteHeightOfRowsChanged {
     [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
-    if (animate == NO) {
-        [NSAnimationContext endGrouping];
-    }
 }
 
 - (void)viewDidMoveToWindow {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16286] trunk

[<ho...@us...>]

Revision: 16286
          http://sourceforge.net/p/skim-app/code/16286
Author:   hofman
Date:     2026-05-11 21:34:00 +0000 (Mon, 11 May 2026)
Log Message:
-----------
single note outlineview conveenience method to update rowheights

Modified Paths:
--------------
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKNotesDocument.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-11 21:16:20 UTC (rev 16285)
+++ trunk/SKMainWindowController_UI.m	2026-05-11 21:34:00 UTC (rev 16286)
@@ -945,7 +945,7 @@
     
     if (mwcFlags.autoResizeNoteRows && [[notification object] isEqual:rightSideController.noteOutlineView] &&
         [(SKScrollView *)[rightSideController.noteOutlineView enclosingScrollView] isResizingSubviews] == NO)
-        [rightSideController.noteOutlineView performSelectorOnce:@selector(resetRowHeightsAnimating) afterDelay:0.0];
+        [rightSideController.noteOutlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
 }
 
 - (void)outlineViewColumnDidMove:(NSNotification *)notification {
@@ -960,7 +960,7 @@
                 break;
         }
         if (oldColumn == firstColumn || newColumn == firstColumn)
-            [rightSideController.noteOutlineView performSelectorOnce:@selector(resetRowHeightsAnimating) afterDelay:0.0];
+            [rightSideController.noteOutlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
     }
 }
 
@@ -1259,7 +1259,7 @@
 - (void)resetHeightOfNoteRows:(id)sender {
     NSArray *items = [sender representedObject];
     if (items == nil) {
-        [rightSideController.noteOutlineView resetRowHeightsAnimating];
+        [rightSideController.noteOutlineView updateRowHeights];
     } else {
         SKNoteOutlineView *ov = rightSideController.noteOutlineView;
         NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
@@ -1325,7 +1325,7 @@
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     NSView *view = [rightSideController.noteOutlineView enclosingScrollView];
     if (mwcFlags.autoResizeNoteRows) {
-        [rightSideController.noteOutlineView resetRowHeightsAnimating];
+        [rightSideController.noteOutlineView updateRowHeights];
         [nc addObserver:self selector:@selector(handleNoteViewFrameDidChangeNotification:)
  name:NSViewFrameDidChangeNotification object:view];
         [nc addObserver:self selector:@selector(handleNoteViewDidEndLiveResizeNotification:)
@@ -2067,8 +2067,10 @@
         if ([[notification object] inLiveResize]) {
             mwcFlags.noteRowHeightsNeedUpdate = YES;
         } else {
-            [rightSideController.noteOutlineView resetRowHeights];
-            [rightSideController.noteOutlineView noteHeightOfRowsChangedAnimating:NO];
+            [NSAnimationContext beginGrouping];
+            [[NSAnimationContext currentContext] setDuration:0.0];
+            [rightSideController.noteOutlineView updateRowHeights];
+            [NSAnimationContext beginGrouping];
         }
     }
 }
@@ -2075,7 +2077,7 @@
 
 - (void)handleNoteViewDidEndLiveResizeNotification:(NSNotification *)notification {
     if (mwcFlags.noteRowHeightsNeedUpdate && mwcFlags.autoResizeNoteRows) {
-        [rightSideController.noteOutlineView resetRowHeightsAnimating];
+        [rightSideController.noteOutlineView updateRowHeights];
     }
 }
 

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h	2026-05-11 21:16:20 UTC (rev 16285)
+++ trunk/SKNoteOutlineView.h	2026-05-11 21:34:00 UTC (rev 16286)
@@ -53,12 +53,10 @@
 
 @property (nonatomic, readonly, getter=isDropping) BOOL dropping;
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate;
-
 - (CGFloat)rowHeightForItem:(id)item;
 - (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item;
 - (void)resetRowHeights;
-- (void)resetRowHeightsAnimating;
+- (void)updateRowHeights;
 
 @end
 

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-11 21:16:20 UTC (rev 16285)
+++ trunk/SKNoteOutlineView.m	2026-05-11 21:34:00 UTC (rev 16286)
@@ -103,17 +103,6 @@
     return self;
 }
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate {
-    if (animate == NO) {
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration:0.0];
-    }
-    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
-    if (animate == NO) {
-        [NSAnimationContext endGrouping];
-    }
-}
-
 - (CGFloat)rowHeightForItem:(id)item {
     return (NSInteger)NSMapGet(rowHeights, (__bridge void *)item);
 }
@@ -129,9 +118,9 @@
     [rowHeights removeAllObjects];
 }
 
-- (void)resetRowHeightsAnimating {
-    [self resetRowHeights];
-    [self noteHeightOfRowsChangedAnimating:YES];
+- (void)updateRowHeights {
+    [rowHeights removeAllObjects];
+    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
 }
 
 - (void)mouseDown:(NSEvent *)theEvent {

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m	2026-05-11 21:16:20 UTC (rev 16285)
+++ trunk/SKNotesDocument.m	2026-05-11 21:34:00 UTC (rev 16286)
@@ -555,7 +555,7 @@
 - (void)resetHeightOfNoteRows:(id)sender {
     NSArray *items = [sender representedObject];
     if (items == nil) {
-        [outlineView resetRowHeightsAnimating];
+        [outlineView updateRowHeights];
     } else {
         NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
         for (id item in items) {
@@ -570,14 +570,16 @@
 
 - (void)handleScrollViewFrameDidChangeNotification:(NSNotification *)notification {
     if (ndFlags.autoResizeRows && [[notification object] inLiveResize] == NO) {
-        [outlineView resetRowHeights];
-        [outlineView noteHeightOfRowsChangedAnimating:NO];
+        [NSAnimationContext beginGrouping];
+        [[NSAnimationContext currentContext] setDuration:0.0];
+        [outlineView updateRowHeights];
+        [NSAnimationContext endGrouping];
     }
 }
 
 - (void)handleScrollViewDidEndLiveResizeNotification:(NSNotification *)notification {
     if (ndFlags.autoResizeRows) {
-        [outlineView resetRowHeightsAnimating];
+        [outlineView updateRowHeights];
     }
 }
 
@@ -586,7 +588,7 @@
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     NSView *view = [outlineView enclosingScrollView];
     if (ndFlags.autoResizeRows) {
-        [outlineView resetRowHeightsAnimating];
+        [outlineView updateRowHeights];
         [nc addObserver:self selector:@selector(handleScrollViewFrameDidChangeNotification:)
  name:NSViewFrameDidChangeNotification object:view];
         [nc addObserver:self selector:@selector(handleScrollViewDidEndLiveResizeNotification:)
@@ -735,7 +737,7 @@
 
 - (void)outlineViewColumnDidResize:(NSNotification *)notification{
     if (ndFlags.autoResizeRows && [(SKScrollView *)[[notification object] enclosingScrollView] isResizingSubviews] == NO)
-        [outlineView performSelectorOnce:@selector(resetRowHeightsAnimating) afterDelay:0.0];
+        [outlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
 }
 
 - (void)outlineViewColumnDidMove:(NSNotification *)notification {
@@ -750,7 +752,7 @@
                 break;
         }
         if (oldColumn == firstColumn || newColumn == firstColumn)
-            [outlineView performSelectorOnce:@selector(resetRowHeightsAnimating) afterDelay:0.0];
+            [outlineView performSelectorOnce:@selector(updateRowHeights) afterDelay:0.0];
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16285] trunk

[<ho...@us...>]

Revision: 16285
          http://sourceforge.net/p/skim-app/code/16285
Author:   hofman
Date:     2026-05-11 21:16:20 +0000 (Mon, 11 May 2026)
Log Message:
-----------
Move noteHeightOfRowsChangedAnimating to note outlineview class. Implement single row case directly.

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKOutlineView.h
    trunk/SKOutlineView.m
    trunk/SKTableView.h
    trunk/SKTableView.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKMainWindowController.m	2026-05-11 21:16:20 UTC (rev 16285)
@@ -2826,7 +2826,7 @@
                 if (mwcFlags.autoResizeNoteRows) {
                     NSInteger row = [rightSideController.noteOutlineView rowForItem:[keyPath isEqualToString:SKNPDFAnnotationStringKey] ? note : [note noteText]];
                     if (row != -1)
-                        [rightSideController.noteOutlineView noteHeightOfRowChanged:row animating:YES];
+                        [rightSideController.noteOutlineView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:row]];
                 }
             }
             
@@ -2945,7 +2945,7 @@
             [thumbnail setImage:image];
             
             if (sameSize == NO) {
-                [leftSideController.thumbnailTableView noteHeightOfRowChanged:[thumbnail pageIndex] animating:YES];
+                [leftSideController.thumbnailTableView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:[thumbnail pageIndex]]];
                 [self updateOverviewItemSize];
             }
         });
@@ -3091,7 +3091,7 @@
             if (fabs(newSize.width - oldSize.width) > 1.0 || fabs(newSize.height - oldSize.height) > 1.0) {
                 NSUInteger idx = [[rightSideController.snapshotArrayController arrangedObjects] indexOfObject:controller];
                 if (idx != NSNotFound)
-                    [rightSideController.snapshotTableView noteHeightOfRowChanged:idx animating:YES];
+                    [rightSideController.snapshotTableView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:idx]];
             }
         });
     });

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKNoteOutlineView.h	2026-05-11 21:16:20 UTC (rev 16285)
@@ -53,6 +53,8 @@
 
 @property (nonatomic, readonly, getter=isDropping) BOOL dropping;
 
+- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate;
+
 - (CGFloat)rowHeightForItem:(id)item;
 - (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item;
 - (void)resetRowHeights;

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKNoteOutlineView.m	2026-05-11 21:16:20 UTC (rev 16285)
@@ -103,6 +103,17 @@
     return self;
 }
 
+- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate {
+    if (animate == NO) {
+        [NSAnimationContext beginGrouping];
+        [[NSAnimationContext currentContext] setDuration:0.0];
+    }
+    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
+    if (animate == NO) {
+        [NSAnimationContext endGrouping];
+    }
+}
+
 - (CGFloat)rowHeightForItem:(id)item {
     return (NSInteger)NSMapGet(rowHeights, (__bridge void *)item);
 }
@@ -142,7 +153,10 @@
                         break;
                     CGFloat currentHeight = fmax([self rowHeight], round(startHeight + [self convertPoint:[theEvent locationInWindow] fromView:nil].y - mouseLoc.y));
                     [self setRowHeight:currentHeight forItem:item];
-                    [self noteHeightOfRowChanged:row animating:NO];
+                    [NSAnimationContext beginGrouping];
+                    [[NSAnimationContext currentContext] setDuration:0.0];
+                    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:row]];
+                    [NSAnimationContext endGrouping];
                 }
                 
                 [NSCursor pop];

Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKOutlineView.h	2026-05-11 21:16:20 UTC (rev 16285)
@@ -82,9 +82,6 @@
 
 - (void)reloadTypeSelectStrings;
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate;
-- (void)noteHeightOfRowChanged:(NSInteger)row animating:(BOOL)animate;
-
 @property (nullable, weak) id<SKOutlineViewDelegate> delegate;
 
 @end

Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKOutlineView.m	2026-05-11 21:16:20 UTC (rev 16285)
@@ -239,28 +239,6 @@
     }
 }
 
-- (void)noteHeightOfRowsChangedAnimating:(BOOL)animate {
-    if (animate == NO) {
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration:0.0];
-    }
-    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [self numberOfRows])]];
-    if (animate == NO) {
-        [NSAnimationContext endGrouping];
-    }
-}
-
-- (void)noteHeightOfRowChanged:(NSInteger)row animating:(BOOL)animate {
-    if (animate == NO) {
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration:0.0];
-    }
-    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:row]];
-    if (animate == NO) {
-        [NSAnimationContext endGrouping];
-    }
-}
-
 - (id)makeViewWithIdentifier:(NSString *)identifier owner:(id)owner {
     id view = [super makeViewWithIdentifier:identifier owner:owner];
     if (font) {

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKTableView.h	2026-05-11 21:16:20 UTC (rev 16285)
@@ -99,7 +99,6 @@
 - (void)reloadTypeSelectStrings;
 
 - (void)noteHeightOfRowsChangedAnimating:(BOOL)animate;
-- (void)noteHeightOfRowChanged:(NSInteger)row animating:(BOOL)animate;
 
 @property (nullable, weak) id<SKTableViewDelegate> delegate;
 

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m	2026-05-11 15:38:15 UTC (rev 16284)
+++ trunk/SKTableView.m	2026-05-11 21:16:20 UTC (rev 16285)
@@ -257,17 +257,6 @@
     }
 }
 
-- (void)noteHeightOfRowChanged:(NSInteger)row animating:(BOOL)animate {
-    if (animate == NO) {
-        [NSAnimationContext beginGrouping];
-        [[NSAnimationContext currentContext] setDuration:0.0];
-    }
-    [self noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:row]];
-    if (animate == NO) {
-        [NSAnimationContext endGrouping];
-    }
-}
-
 - (void)viewDidMoveToWindow {
     [super viewDidMoveToWindow];
     if ([self window] == nil)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16284] trunk/SKPresentationOptionsSheetController.m

[<ho...@us...>]

Revision: 16284
          http://sourceforge.net/p/skim-app/code/16284
Author:   hofman
Date:     2026-05-11 15:38:15 +0000 (Mon, 11 May 2026)
Log Message:
-----------
create transition info directly with existing one

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

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m	2026-05-11 15:09:15 UTC (rev 16283)
+++ trunk/SKPresentationOptionsSheetController.m	2026-05-11 15:38:15 UTC (rev 16284)
@@ -108,9 +108,10 @@
         
         SKTransitionController *transitionController = [controller transitionControllerCreating:NO];
         
-        transition = [[SKLabeledTransitionInfo alloc] init];
         if ([transitionController transition])
-            [transition setInfo:[transitionController transition]];
+            transition = [[SKLabeledTransitionInfo alloc] initWithTransitionInfo:[transitionController transition]];
+        else
+            transition = [[SKLabeledTransitionInfo alloc] init];
         if ([transitionController pageTransitions]) {
             transitions = [self makeTransitions:[transitionController pageTransitions]];
             separate = YES;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16283] trunk/SKMainDocument.m

[<ho...@us...>]

Revision: 16283
          http://sourceforge.net/p/skim-app/code/16283
Author:   hofman
Date:     2026-05-11 15:09:15 +0000 (Mon, 11 May 2026)
Log Message:
-----------
avoid initializer with nil argument

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

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m	2026-05-11 14:48:30 UTC (rev 16282)
+++ trunk/SKMainDocument.m	2026-05-11 15:09:15 UTC (rev 16283)
@@ -1639,14 +1639,16 @@
 
 - (void)setPresentationOptions:(NSDictionary *)dictionary {
     SKTransitionController *transitions = [[self primaryWindowController] transitionControllerCreating:dictionary != nil];
-    if (dictionary == nil) {
+    if (dictionary) {
+        [transitions setTransition:[[SKTransitionInfo alloc] initWithProperties:dictionary]];
+        [transitions setPageTransitions:[dictionary objectForKey:PAGETRANSITIONS_KEY]];
+    } else if (transitions) {
         NSUInteger count = [[transitions pageTransitions] count];
-        if (count == 0 || count + 1 == [[self pdfDocument] pageCount])
-            return;
+        if (count > 0 && count + 1 != [[self pdfDocument] pageCount]) {
+            [transitions setTransition:[[SKTransitionInfo alloc] init]];
+            [transitions setPageTransitions:nil];
+        }
     }
-    SKTransitionInfo *transition = [[SKTransitionInfo alloc] initWithProperties:dictionary];
-    [transitions setTransition:transition];
-    [transitions setPageTransitions:[dictionary objectForKey:PAGETRANSITIONS_KEY]];
 }
 
 - (NSArray *)snapshots {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16282] trunk/SKPresentationView .m

[<ho...@us...>]

Revision: 16282
          http://sourceforge.net/p/skim-app/code/16282
Author:   hofman
Date:     2026-05-11 14:48:30 +0000 (Mon, 11 May 2026)
Log Message:
-----------
avoid early returns

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

Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m	2026-05-11 14:38:05 UTC (rev 16281)
+++ trunk/SKPresentationView.m	2026-05-11 14:48:30 UTC (rev 16282)
@@ -466,48 +466,46 @@
 }
 
 - (void)predrawNextPage {
-    if (page == nil)
-        return;
-    
-    // generate an image for the next page in the background, which is usually needed next for a presentation
-    
-    NSUInteger pageIndex = [page pageIndex] + 1;
-    
-    if (pageIndex >= [[page document] pageCount])
-        return;
-    
-    if (predrawnImages == nil)
-        predrawnImages = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality valueOptions:NSPointerFunctionsStrongMemory | NSPointerFunctionsObjectPersonality capacity:2];
-    else if (NSMapGet(predrawnImages, (void *)pageIndex))
-        return;
-    
-    __block void *block = NULL;
-    dispatch_block_t imageGenerator = [self imageGeneratorForPage:[[page document] pageAtIndex:pageIndex] handler:^(NSImage *image){
-        if (predrawnImages && block == NSMapGet(predrawnImages, (void *)pageIndex)) {
-            NSMapRemove(predrawnImages, (void *)pageIndex);
-            NSUInteger currentIndex = [page pageIndex];
-            if (pageIndex > currentIndex)
-                NSMapInsert(predrawnImages, (void *)pageIndex, (__bridge void *)image);
-            else if (pageIndex == currentIndex)
-                [pageLayer setContents:image];
+    if (page) {
+        // generate an image for the next page in the background, which is usually needed next for a presentation
+        
+        NSUInteger pageIndex = [page pageIndex] + 1;
+        
+        if (pageIndex < [[page document] pageCount]) {
+            
+            if (predrawnImages == nil)
+                predrawnImages = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality valueOptions:NSPointerFunctionsStrongMemory | NSPointerFunctionsObjectPersonality capacity:2];
+            else if (NSMapGet(predrawnImages, (void *)pageIndex))
+                return;
+            
+            __block void *block = NULL;
+            dispatch_block_t imageGenerator = [self imageGeneratorForPage:[[page document] pageAtIndex:pageIndex] handler:^(NSImage *image){
+                if (predrawnImages && block == NSMapGet(predrawnImages, (void *)pageIndex)) {
+                    NSMapRemove(predrawnImages, (void *)pageIndex);
+                    NSUInteger currentIndex = [page pageIndex];
+                    if (pageIndex > currentIndex)
+                        NSMapInsert(predrawnImages, (void *)pageIndex, (__bridge void *)image);
+                    else if (pageIndex == currentIndex)
+                        [pageLayer setContents:image];
+                }
+            }];
+            
+            if (imageGenerator) {
+                
+                // set this block so we can cancel it
+                block = (__bridge void *)imageGenerator;
+                NSMapInsert(predrawnImages, (void *)pageIndex, block);
+                
+                static dispatch_queue_t predrawingQueue = nil;
+                if (predrawingQueue == nil) {
+                    dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_BACKGROUND, 0);
+                    predrawingQueue = dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.predrawing", queuePriority);
+                }
+                
+                dispatch_async(predrawingQueue, imageGenerator);
+            }
         }
-    }];
-    
-    if (imageGenerator == nil)
-        return;
-    
-    // set this block so we can cancel it
-    block = (__bridge void *)imageGenerator;
-    NSMapInsert(predrawnImages, (void *)pageIndex, block);
-    
-    static dispatch_queue_t predrawingQueue = nil;
-    if (predrawingQueue == nil) {
-        dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_BACKGROUND, 0);
-        predrawingQueue = dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.predrawing", queuePriority);
     }
-    
-    dispatch_async(predrawingQueue, imageGenerator);
-    
 }
 
 - (void)displayCurrentPage:(void (^)(void))completionHandler {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16281] trunk/SKPresentationView.m

[<ho...@us...>]

Revision: 16281
          http://sourceforge.net/p/skim-app/code/16281
Author:   hofman
Date:     2026-05-11 14:38:05 +0000 (Mon, 11 May 2026)
Log Message:
-----------
avoid early returns

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

Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m	2026-05-10 21:52:59 UTC (rev 16280)
+++ trunk/SKPresentationView.m	2026-05-11 14:38:05 UTC (rev 16281)
@@ -329,44 +329,38 @@
 }
 
 - (void)displayCurrentPage:(void (^)(void))completionHandler {
-    if (page == nil) {
-        if (completionHandler)
-            completionHandler();
-        return;
+    if (page) {
+        NSUInteger pageIndex = [page pageIndex];
+        NSImage *predrawnImage = [self predrawnImageAtIndex:pageIndex];
+        
+        if (predrawnImage) {
+            [pageLayer setContents:predrawnImage];
+            [self removePredrawnImageAtIndex:pageIndex];
+        } else {
+            
+            dispatch_block_t imageGenerator = [self imageGeneratorForPage:page handler:^(NSImage *image){
+                if (page && pageIndex == [page pageIndex])
+                    [pageLayer setContents:image];
+                if (completionHandler)
+                    completionHandler();
+            }];
+            
+            if (imageGenerator) {
+                
+                static dispatch_queue_t drawingQueue = nil;
+                if (drawingQueue == nil) {
+                    dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_UTILITY, 0);
+                    drawingQueue = dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.drawing", queuePriority);
+                }
+                
+                dispatch_async(drawingQueue, imageGenerator);
+                return;
+            }
+        }
     }
     
-    NSUInteger pageIndex = [page pageIndex];
-    NSImage *predrawnImage = [self predrawnImageAtIndex:pageIndex];
-    
-    if (predrawnImage) {
-        [pageLayer setContents:predrawnImage];
-        [self removePredrawnImageAtIndex:pageIndex];
-        if (completionHandler)
-            completionHandler();
-        return;
-    }
-    
-    dispatch_block_t imageGenerator = [self imageGeneratorForPage:page handler:^(NSImage *image){
-        if (page && pageIndex == [page pageIndex])
-            [pageLayer setContents:image];
-        if (completionHandler)
-            completionHandler();
-    }];
-    
-    if (imageGenerator == nil) {
-        if (completionHandler)
-            completionHandler();
-        return;
-    }
-    
-    static dispatch_queue_t drawingQueue = nil;
-    if (drawingQueue == nil) {
-        dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_UTILITY, 0);
-        drawingQueue = dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.drawing", queuePriority);
-    }
-    
-    dispatch_async(drawingQueue, imageGenerator);
-    
+    if (completionHandler)
+        completionHandler();
 }
 
 - (void)redisplayAtCurrentScaleFactorIfNeeded {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16280] trunk

[<ho...@us...>]

Revision: 16280
          http://sourceforge.net/p/skim-app/code/16280
Author:   hofman
Date:     2026-05-10 21:52:59 +0000 (Sun, 10 May 2026)
Log Message:
-----------
use NSTableViewRowViewKey for row views

Modified Paths:
--------------
    trunk/LeftSideView.xib
    trunk/RightSideView.xib
    trunk/SKMainWindowController_UI.m

Modified: trunk/LeftSideView.xib
===================================================================
--- trunk/LeftSideView.xib	2026-05-10 21:10:59 UTC (rev 16279)
+++ trunk/LeftSideView.xib	2026-05-10 21:52:59 UTC (rev 16280)
@@ -162,7 +162,7 @@
                                             <outlet property="imageView" destination="HAk-jf-rsO" id="XZB-YV-uN3"/>
                                         </connections>
                                     </tableCellView>
-                                    <customView identifier="row" translatesAutoresizingMaskIntoConstraints="NO" id="3fH-4A-dgM" customClass="SKHighlightingTableRowView">
+                                    <customView identifier="NSTableViewRowViewKey" translatesAutoresizingMaskIntoConstraints="NO" id="3fH-4A-dgM" customClass="SKHighlightingTableRowView">
                                         <rect key="frame" x="11" y="35" width="132" height="32"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     </customView>
@@ -286,7 +286,7 @@
                                             <outlet property="textField" destination="9Hp-6e-4aM" id="UjA-VO-WkQ"/>
                                         </connections>
                                     </tableCellView>
-                                    <customView identifier="row" translatesAutoresizingMaskIntoConstraints="NO" id="6hb-e2-9aK" customClass="SKHighlightingTableRowView">
+                                    <customView identifier="NSTableViewRowViewKey" translatesAutoresizingMaskIntoConstraints="NO" id="6hb-e2-9aK" customClass="SKHighlightingTableRowView">
                                         <rect key="frame" x="11" y="20" width="134" height="32"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     </customView>

Modified: trunk/RightSideView.xib
===================================================================
--- trunk/RightSideView.xib	2026-05-10 21:10:59 UTC (rev 16279)
+++ trunk/RightSideView.xib	2026-05-10 21:52:59 UTC (rev 16280)
@@ -148,7 +148,7 @@
                                             <outlet property="textField" destination="T6H-tX-biW" id="2xe-tZ-MEc"/>
                                         </connections>
                                     </tableCellView>
-                                    <customView identifier="row" translatesAutoresizingMaskIntoConstraints="NO" id="84k-Om-OZ4" customClass="SKNoteTableRowView">
+                                    <customView identifier="NSTableViewRowViewKey" translatesAutoresizingMaskIntoConstraints="NO" id="84k-Om-OZ4" customClass="SKNoteTableRowView">
                                         <rect key="frame" x="1" y="18" width="93" height="17"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </customView>

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 21:10:59 UTC (rev 16279)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 21:52:59 UTC (rev 16280)
@@ -105,8 +105,6 @@
 
 #define HEADER_IDENTIFIER @"header"
 
-#define ROWVIEW_IDENTIFIER @"row"
-
 #define SKLeftSidePaneWidthKey  @"SKLeftSidePaneWidth"
 #define SKRightSidePaneWidthKey @"SKRightSidePaneWidth"
 
@@ -495,7 +493,7 @@
 
 - (NSView *)tableView:(NSTableView *)tv rowViewForRow:(NSInteger)row {
     if ([tv isEqual:leftSideController.thumbnailTableView]) {
-        SKHighlightingTableRowView *rowView = [tv makeViewWithIdentifier:ROWVIEW_IDENTIFIER owner:self];
+        SKHighlightingTableRowView *rowView = [tv makeViewWithIdentifier:NSTableViewRowViewKey owner:self];
         [rowView setHighlightLevel:[self thumbnailHighlightLevelForRow:row]];
         return rowView;
     }
@@ -871,12 +869,10 @@
 - (NSTableRowView *)outlineView:(NSOutlineView *)ov rowViewForItem:(id)item {
     if ([ov isEqual:leftSideController.tocOutlineView]) {
         if (@available(macOS 11.0, *)) {
-            SKHighlightingTableRowView *rowView = [ov makeViewWithIdentifier:ROWVIEW_IDENTIFIER owner:self];
+            SKHighlightingTableRowView *rowView = [ov makeViewWithIdentifier:NSTableViewRowViewKey owner:self];
             [rowView setHighlightLevel:[self tocHighlightLevelForRow:[ov rowForItem:item]]];
             return rowView;
         }
-    } else if ([ov isEqual:rightSideController.noteOutlineView]) {
-        return [ov makeViewWithIdentifier:ROWVIEW_IDENTIFIER owner:self];
     }
     return nil;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16279
          http://sourceforge.net/p/skim-app/code/16279
Author:   hofman
Date:     2026-05-10 21:10:59 +0000 (Sun, 10 May 2026)
Log Message:
-----------
no need to set autoresizing mask for level indicator

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 17:24:16 UTC (rev 16278)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 21:10:59 UTC (rev 16279)
@@ -487,17 +487,8 @@
         return view;
     } else if ([tv isEqual:rightSideController.snapshotTableView]) {
         return [tv makeViewWithIdentifier:[tableColumn identifier] owner:self];
-    } else if ([tv isEqual:leftSideController.findTableView]) {
+    } else if ([tv isEqual:leftSideController.findTableView] || [tv isEqual:leftSideController.groupedFindTableView]) {
         return [tv makeViewWithIdentifier:([tableColumn identifier] ?: HEADER_IDENTIFIER) owner:self];
-    } else if ([tv isEqual:leftSideController.groupedFindTableView]) {
-        NSTableCellView *view = [tv makeViewWithIdentifier:([tableColumn identifier] ?: HEADER_IDENTIFIER) owner:self];
-        if ([[tableColumn identifier] isEqualToString:RELEVANCE_COLUMNID]) {
-            // IB does not allow setting te height and height sizable mask of a NSLeveleIndicator
-            NSControl *levelIndicator = [(SKControlTableCellView *)view control];
-            [levelIndicator setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-            [levelIndicator setFrame:[view bounds]];
-        }
-        return view;
     }
     return nil;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16278] trunk

[<ho...@us...>]

Revision: 16278
          http://sourceforge.net/p/skim-app/code/16278
Author:   hofman
Date:     2026-05-10 17:24:16 +0000 (Sun, 10 May 2026)
Log Message:
-----------
update all utility panels from updateUtilityPaneels directly, only update selected color when changing color property

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

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m	2026-05-10 17:06:59 UTC (rev 16277)
+++ trunk/SKMainWindowController_Actions.m	2026-05-10 17:24:16 UTC (rev 16278)
@@ -91,7 +91,6 @@
 #define SKShowToolbarInFullScreenKey @"SKShowToolbarInFullScreen"
 
 @interface SKMainWindowController (SKPrivateUI)
-- (void)updateLineInspector;
 - (void)updateNoteFilterPredicate;
 - (void)updateSnapshotFilterPredicate;
 @end
@@ -189,9 +188,9 @@
             case SKNoLineChangeAction:
                 break;
         }
+        // in case one property changes another, e.g. when adding a dashPattern the borderStyle can change
+        [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
         mwcFlags.updatingLine = 0;
-        // in case one property changes another, e.g. when adding a dashPattern the borderStyle can change
-        [self updateLineInspector];
     }
 }
 

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 17:06:59 UTC (rev 16277)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 17:24:16 UTC (rev 16278)
@@ -134,7 +134,6 @@
 @end
 
 @interface SKMainWindowController (UIPrivate)
-- (void)changeColorProperty:(id)sender;
 - (void)handleNoteViewFrameDidChangeNotification:(NSNotification *)notification;
 - (void)handleNoteViewDidEndLiveResizeNotification:(NSNotification *)notification;
 @end
@@ -145,68 +144,42 @@
 
 #pragma mark Utility panel updating
 
-- (NSButton *)newColorAccessoryButtonWithTitle:(NSString *)title {
-    NSButton *button = [[NSButton alloc] init];
-    [button setButtonType:NSSwitchButton];
-    [button setTitle:title];
-    [[button cell] setControlSize:NSControlSizeSmall];
-    [button setTarget:self];
-    [button setAction:@selector(changeColorProperty:)];
-    [button sizeToFit];
-    return button;
-}
-
-- (void)updateColorPanel {
+- (void)updateColorPanel:(id)sender{
     PDFAnnotation *annotation = [pdfView currentAnnotation];
     NSColor *color = nil;
-    NSView *accessoryView = nil;
     
-    if ([annotation hasInteriorColor]) {
-        if (colorAccessoryView == nil)
-            colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
-        accessoryView = colorAccessoryView;
-    } else if ([annotation isText]) {
-        if (textColorAccessoryView == nil)
-            textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
-        accessoryView = textColorAccessoryView;
-    }
-    if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn) {
+    if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn)
         color = [(id)annotation interiorColor] ?: [NSColor clearColor];
-    } else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn) {
+    else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn)
         color = [(id)annotation fontColor] ?: [NSColor blackColor];
-    } else {
+    else
         color = [annotation color];
-    }
+    
     if (color) {
         mwcFlags.updatingColor = 1;
         [[NSColorPanel sharedColorPanel] setColor:color];
         mwcFlags.updatingColor = 0;
     }
-    
-    if ([[NSColorPanel sharedColorPanel] accessoryView] != accessoryView) {
-        [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
-        [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
-    }
 }
 
-- (void)changeColorProperty:(id)sender{
-   [self updateColorPanel];
+- (NSButton *)newColorAccessoryButtonWithTitle:(NSString *)title {
+    NSButton *button = [[NSButton alloc] init];
+    [button setButtonType:NSSwitchButton];
+    [button setTitle:title];
+    [[button cell] setControlSize:NSControlSizeSmall];
+    [button setTarget:self];
+    [button setAction:@selector(updateColorPanel:)];
+    [button sizeToFit];
+    return button;
 }
 
-- (void)updateLineInspector {
-    PDFAnnotation *annotation = [pdfView currentAnnotation];
-    
-    if ([annotation hasBorder]) {
-        mwcFlags.updatingLine = 1;
-        [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
-        mwcFlags.updatingLine = 0;
-    }
-}
-
 - (void)updateUtilityPanels {
     if ([[self window] isMainWindow]) {
         PDFAnnotation *annotation = [pdfView currentAnnotation];
+        NSView *accessoryView = nil;
+        
         if ([annotation isSkimNote]) {
+            
             if ([annotation isText]) {
                 mwcFlags.updatingFont = 1;
                 [[NSFontManager sharedFontManager] setSelectedFont:[annotation font] isMultiple:NO];
@@ -214,13 +187,31 @@
                 mwcFlags.updatingFontAttributes = 1;
                 [[NSFontManager sharedFontManager] setSelectedAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[annotation fontColor], NSForegroundColorAttributeName, nil] isMultiple:NO];
                 mwcFlags.updatingFontAttributes = 0;
+                
+                if (textColorAccessoryView == nil)
+                    textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
+                accessoryView = textColorAccessoryView;
+                
+            } else if ([annotation hasBorder]) {
+                
+                mwcFlags.updatingLine = 1;
+                [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
+                mwcFlags.updatingLine = 0;
+                
+                if ([annotation hasInteriorColor]) {
+                    if (colorAccessoryView == nil)
+                        colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
+                    accessoryView = colorAccessoryView;
+                }
             }
             
-            [self updateColorPanel];
-            [self updateLineInspector];
+            [self updateColorPanel:nil];
             
-        } else if ([[NSColorPanel sharedColorPanel] accessoryView]) {
+        }
+        
+        if ([[NSColorPanel sharedColorPanel] accessoryView] != accessoryView) {
             [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
+            [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
         }
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16277
          http://sourceforge.net/p/skim-app/code/16277
Author:   hofman
Date:     2026-05-10 17:06:59 +0000 (Sun, 10 May 2026)
Log Message:
-----------
only call utility panel updates when selecting a skim notee

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:56:22 UTC (rev 16276)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 17:06:59 UTC (rev 16277)
@@ -161,29 +161,28 @@
     NSColor *color = nil;
     NSView *accessoryView = nil;
     
-    if ([annotation isSkimNote]) {
-        if ([annotation hasInteriorColor]) {
-            if (colorAccessoryView == nil)
-                colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
-            accessoryView = colorAccessoryView;
-        } else if ([annotation isText]) {
-            if (textColorAccessoryView == nil)
-                textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
-            accessoryView = textColorAccessoryView;
-        }
-        if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn) {
-            color = [(id)annotation interiorColor] ?: [NSColor clearColor];
-        } else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn) {
-            color = [(id)annotation fontColor] ?: [NSColor blackColor];
-        } else {
-            color = [annotation color];
-        }
-        if (color) {
-            mwcFlags.updatingColor = 1;
-            [[NSColorPanel sharedColorPanel] setColor:color];
-            mwcFlags.updatingColor = 0;
-        }
+    if ([annotation hasInteriorColor]) {
+        if (colorAccessoryView == nil)
+            colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
+        accessoryView = colorAccessoryView;
+    } else if ([annotation isText]) {
+        if (textColorAccessoryView == nil)
+            textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
+        accessoryView = textColorAccessoryView;
     }
+    if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn) {
+        color = [(id)annotation interiorColor] ?: [NSColor clearColor];
+    } else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn) {
+        color = [(id)annotation fontColor] ?: [NSColor blackColor];
+    } else {
+        color = [annotation color];
+    }
+    if (color) {
+        mwcFlags.updatingColor = 1;
+        [[NSColorPanel sharedColorPanel] setColor:color];
+        mwcFlags.updatingColor = 0;
+    }
+    
     if ([[NSColorPanel sharedColorPanel] accessoryView] != accessoryView) {
         [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
         [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
@@ -216,10 +215,13 @@
                 [[NSFontManager sharedFontManager] setSelectedAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[annotation fontColor], NSForegroundColorAttributeName, nil] isMultiple:NO];
                 mwcFlags.updatingFontAttributes = 0;
             }
+            
+            [self updateColorPanel];
+            [self updateLineInspector];
+            
+        } else if ([[NSColorPanel sharedColorPanel] accessoryView]) {
+            [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
         }
-        
-        [self updateColorPanel];
-        [self updateLineInspector];
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16276] trunk/SKMainWindowController_UI.m

[<ho...@us...>]

Revision: 16276
          http://sourceforge.net/p/skim-app/code/16276
Author:   hofman
Date:     2026-05-10 16:56:22 +0000 (Sun, 10 May 2026)
Log Message:
-----------
check for main window before calling utility panel update methods, or it will be called only when main

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:49:15 UTC (rev 16275)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:56:22 UTC (rev 16276)
@@ -157,34 +157,27 @@
 }
 
 - (void)updateColorPanel {
-    if ([[self window] isMainWindow]) {
-        PDFAnnotation *annotation = [pdfView currentAnnotation];
-        NSColor *color = nil;
-        NSView *accessoryView = nil;
-        
-        if ([annotation isSkimNote]) {
-            if ([annotation hasInteriorColor]) {
-                if (colorAccessoryView == nil)
-                    colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
-                accessoryView = colorAccessoryView;
-            } else if ([annotation isText]) {
-                if (textColorAccessoryView == nil)
-                    textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
-                accessoryView = textColorAccessoryView;
-            }
-            if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn) {
-                color = [(id)annotation interiorColor] ?: [NSColor clearColor];
-            } else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn) {
-                color = [(id)annotation fontColor] ?: [NSColor blackColor];
-            } else {
-                color = [annotation color];
-            }
+    PDFAnnotation *annotation = [pdfView currentAnnotation];
+    NSColor *color = nil;
+    NSView *accessoryView = nil;
+    
+    if ([annotation isSkimNote]) {
+        if ([annotation hasInteriorColor]) {
+            if (colorAccessoryView == nil)
+                colorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Fill color", @"Check button title")];
+            accessoryView = colorAccessoryView;
+        } else if ([annotation isText]) {
+            if (textColorAccessoryView == nil)
+                textColorAccessoryView = [self newColorAccessoryButtonWithTitle:NSLocalizedString(@"Text color", @"Check button title")];
+            accessoryView = textColorAccessoryView;
         }
-        if ([[NSColorPanel sharedColorPanel] accessoryView] != accessoryView) {
-            [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
-            [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
+        if ([annotation hasInteriorColor] && [colorAccessoryView state] == NSControlStateValueOn) {
+            color = [(id)annotation interiorColor] ?: [NSColor clearColor];
+        } else if ([annotation isText] && [textColorAccessoryView state] == NSControlStateValueOn) {
+            color = [(id)annotation fontColor] ?: [NSColor blackColor];
+        } else {
+            color = [annotation color];
         }
-        
         if (color) {
             mwcFlags.updatingColor = 1;
             [[NSColorPanel sharedColorPanel] setColor:color];
@@ -191,6 +184,10 @@
             mwcFlags.updatingColor = 0;
         }
     }
+    if ([[NSColorPanel sharedColorPanel] accessoryView] != accessoryView) {
+        [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
+        [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
+    }
 }
 
 - (void)changeColorProperty:(id)sender{
@@ -200,7 +197,7 @@
 - (void)updateLineInspector {
     PDFAnnotation *annotation = [pdfView currentAnnotation];
     
-    if ([[self window] isMainWindow] && [annotation hasBorder]) {
+    if ([annotation hasBorder]) {
         mwcFlags.updatingLine = 1;
         [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
         mwcFlags.updatingLine = 0;
@@ -220,10 +217,10 @@
                 mwcFlags.updatingFontAttributes = 0;
             }
         }
+        
+        [self updateColorPanel];
+        [self updateLineInspector];
     }
-    
-    [self updateColorPanel];
-    [self updateLineInspector];
 }
 
 #pragma mark NSWindow delegate protocol

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16275
          http://sourceforge.net/p/skim-app/code/16275
Author:   hofman
Date:     2026-05-10 16:49:15 +0000 (Sun, 10 May 2026)
Log Message:
-----------
rename method

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:41:20 UTC (rev 16274)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:49:15 UTC (rev 16275)
@@ -207,10 +207,9 @@
     }
 }
 
-- (void)updateUtilityPanel {
-    PDFAnnotation *annotation = [pdfView currentAnnotation];
-    
+- (void)updateUtilityPanels {
     if ([[self window] isMainWindow]) {
+        PDFAnnotation *annotation = [pdfView currentAnnotation];
         if ([annotation isSkimNote]) {
             if ([annotation isText]) {
                 mwcFlags.updatingFont = 1;
@@ -231,7 +230,7 @@
 
 - (void)windowDidBecomeMain:(NSNotification *)notification {
     if ([self interactionMode] != SKPresentationMode) {
-        [self updateUtilityPanel];
+        [self updateUtilityPanels];
     } else if ([NSApp isActive] && [[NSUserDefaults standardUserDefaults] boolForKey:SKUseNormalLevelForPresentationKey] == NO) {
         [[self window] setLevel:NSPopUpMenuWindowLevel];
     }
@@ -2063,7 +2062,7 @@
     
     annotation = [pdfView currentAnnotation];
     if ([[self window] isMainWindow])
-        [self updateUtilityPanel];
+        [self updateUtilityPanels];
     if ([annotation isSkimNote]) {
         if ([[self selectedNotes] containsObject:annotation] == NO) {
             [ov selectRowIndexes:[NSIndexSet indexSetWithIndex:[ov rowForItem:annotation]] byExtendingSelection:NO];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16274
          http://sourceforge.net/p/skim-app/code/16274
Author:   hofman
Date:     2026-05-10 16:41:20 +0000 (Sun, 10 May 2026)
Log Message:
-----------
only update color panel when window is main

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:33:21 UTC (rev 16273)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:41:20 UTC (rev 16274)
@@ -157,11 +157,11 @@
 }
 
 - (void)updateColorPanel {
-    PDFAnnotation *annotation = [pdfView currentAnnotation];
-    NSColor *color = nil;
-    NSView *accessoryView = nil;
-    
     if ([[self window] isMainWindow]) {
+        PDFAnnotation *annotation = [pdfView currentAnnotation];
+        NSColor *color = nil;
+        NSView *accessoryView = nil;
+        
         if ([annotation isSkimNote]) {
             if ([annotation hasInteriorColor]) {
                 if (colorAccessoryView == nil)
@@ -184,13 +184,13 @@
             [[NSColorPanel sharedColorPanel] setAccessoryView:nil];
             [[NSColorPanel sharedColorPanel] setAccessoryView:accessoryView];
         }
+        
+        if (color) {
+            mwcFlags.updatingColor = 1;
+            [[NSColorPanel sharedColorPanel] setColor:color];
+            mwcFlags.updatingColor = 0;
+        }
     }
-    
-    if (color) {
-        mwcFlags.updatingColor = 1;
-        [[NSColorPanel sharedColorPanel] setColor:color];
-        mwcFlags.updatingColor = 0;
-    }
 }
 
 - (void)changeColorProperty:(id)sender{
@@ -200,7 +200,7 @@
 - (void)updateLineInspector {
     PDFAnnotation *annotation = [pdfView currentAnnotation];
     
-    if ([[self window] isMainWindow] &&[annotation hasBorder]) {
+    if ([[self window] isMainWindow] && [annotation hasBorder]) {
         mwcFlags.updatingLine = 1;
         [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
         mwcFlags.updatingLine = 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16273
          http://sourceforge.net/p/skim-app/code/16273
Author:   hofman
Date:     2026-05-10 16:33:21 +0000 (Sun, 10 May 2026)
Log Message:
-----------
don't clear note selection when ending current note

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:32:04 UTC (rev 16272)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:33:21 UTC (rev 16273)
@@ -2069,8 +2069,6 @@
             [ov selectRowIndexes:[NSIndexSet indexSetWithIndex:[ov rowForItem:annotation]] byExtendingSelection:NO];
         }
         [self setHasOutline:YES forAnnotation:annotation];
-    } else {
-        [ov deselectAll:self];
     }
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SKDisplayNoteBoundsKey])
         [self updateRightStatus];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16272
          http://sourceforge.net/p/skim-app/code/16272
Author:   hofman
Date:     2026-05-10 16:32:04 +0000 (Sun, 10 May 2026)
Log Message:
-----------
don't update note selection when page changes, we long ago stopped going to the page of the selected note

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:30:43 UTC (rev 16271)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:32:04 UTC (rev 16272)
@@ -434,46 +434,6 @@
     }
 }
 
-- (void)updateNoteSelection {
-    NSSortDescriptor *sortDesc = [[rightSideController.noteArrayController sortDescriptors] firstObject];
-    
-    if ([[sortDesc key] isEqualToString:SKNPDFAnnotationPageIndexKey] == NO)
-        return;
-    
-    NSArray *orderedNotes = [rightSideController.noteArrayController arrangedObjects];
-    __block PDFAnnotation *selAnnotation = nil;
-    NSUInteger pageIndex = [[pdfView currentPage] pageIndex];
-    NSMutableIndexSet *selPageIndexes = [NSMutableIndexSet indexSet];
-    NSEnumerationOptions options = [sortDesc ascending] ? 0 : NSEnumerationReverse;
-    
-    for (PDFAnnotation *annotation in [self selectedNotes]) {
-        if ([annotation pageIndex] != NSNotFound)
-            [selPageIndexes addIndex:[annotation pageIndex]];
-    }
-    
-    if ([orderedNotes count] == 0 || [selPageIndexes containsIndex:pageIndex])
-        return;
-    
-    // Walk outline view looking for best firstpage number match.
-    [orderedNotes enumerateObjectsWithOptions:options usingBlock:^(PDFAnnotation *annotation, NSUInteger i, BOOL *stop) {
-        if ([annotation pageIndex] == pageIndex) {
-            selAnnotation = annotation;
-            *stop = YES;
-        } else if ([annotation pageIndex] > pageIndex) {
-            if (i == 0)
-                selAnnotation = [orderedNotes objectAtIndex:0];
-            else if ([selPageIndexes containsIndex:[[orderedNotes objectAtIndex:i - 1] pageIndex]])
-                selAnnotation = [orderedNotes objectAtIndex:i - 1];
-            *stop = YES;
-        }
-    }];
-    if (selAnnotation) {
-        NSInteger row = [rightSideController.noteOutlineView rowForItem:selAnnotation];
-        [rightSideController.noteOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-        [rightSideController.noteOutlineView scrollRowToVisible:row];
-    }
-}
-
 #pragma mark NSTableView datasource protocol
 
 // AppKit bug: need a dummy NSTableDataSource implementation, otherwise some NSTableView delegate methods are ignored
@@ -2061,7 +2021,6 @@
     
     [self updateThumbnailSelectionHighlights];
     [self updateTocSelectionHighlights];
-    [self updateNoteSelection];
     
     if (beforeMarkedPage.pageIndex != NSNotFound && [[pdfView currentPage] pageIndex] != markedPage.pageIndex)
         beforeMarkedPage.pageIndex = NSNotFound;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[16271] trunk

[<ho...@us...>]

Revision: 16271
          http://sourceforge.net/p/skim-app/code/16271
Author:   hofman
Date:     2026-05-10 16:30:43 +0000 (Sun, 10 May 2026)
Log Message:
-----------
remove updatingNoteSelection flag as it is never checked for

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

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h	2026-05-10 16:02:59 UTC (rev 16270)
+++ trunk/SKMainWindowController.h	2026-05-10 16:30:43 UTC (rev 16271)
@@ -179,7 +179,6 @@
         unsigned int addOrRemoveNotesInBulk:1;
         unsigned int updatingOutlineSelection:1;
         unsigned int updatingThumbnailSelection:1;
-        unsigned int updatingNoteSelection:1;
         unsigned int updatingFindResults:1;
         unsigned int updatingColor:1;
         unsigned int updatingFont:1;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2026-05-10 16:02:59 UTC (rev 16270)
+++ trunk/SKMainWindowController.m	2026-05-10 16:30:43 UTC (rev 16271)
@@ -2258,9 +2258,7 @@
             if ([annotation isSkimNote]) {
                 [annotation setShouldDisplay:[pdfView hideNotes] == NO];
                 [annotation setShouldPrint:[pdfView hideNotes] == NO];
-                mwcFlags.updatingNoteSelection = 1;
                 [self insertObject:annotation inNotesAtIndex:[notes count]];
-                mwcFlags.updatingNoteSelection = 0;
                 [rightSideController.noteOutlineView reloadData];
             }
             
@@ -2301,11 +2299,9 @@
                 if ([[self selectedNotes] containsObject:annotation])
                     [rightSideController.noteOutlineView deselectAll:self];
                 
-                mwcFlags.updatingNoteSelection = 1;
                 NSUInteger i = [notes indexOfObject:annotation];
                 if (i != NSNotFound)
                     [self removeObjectFromNotesAtIndex:i];
-                mwcFlags.updatingNoteSelection = 0;
                 [rightSideController.noteOutlineView reloadData];
             }
             

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 16:02:59 UTC (rev 16270)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 16:30:43 UTC (rev 16271)
@@ -468,11 +468,9 @@
         }
     }];
     if (selAnnotation) {
-        mwcFlags.updatingNoteSelection = 1;
         NSInteger row = [rightSideController.noteOutlineView rowForItem:selAnnotation];
         [rightSideController.noteOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
         [rightSideController.noteOutlineView scrollRowToVisible:row];
-        mwcFlags.updatingNoteSelection = 0;
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16270
          http://sourceforge.net/p/skim-app/code/16270
Author:   hofman
Date:     2026-05-10 16:02:59 +0000 (Sun, 10 May 2026)
Log Message:
-----------
extend ignoring outline selection

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

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m	2026-05-10 15:56:51 UTC (rev 16269)
+++ trunk/SKMainWindowController_Actions.m	2026-05-10 16:02:59 UTC (rev 16270)
@@ -248,7 +248,6 @@
         [pdfView performAction:[outlineItem action]];
     else if ([outlineItem destination])
         [pdfView goToDestination:[outlineItem destination]];
-    mwcFlags.updatingOutlineSelection = 0;
     if ([self interactionMode] == SKPresentationMode) {
         PDFPage *page = [outlineItem page];
         if (page) {
@@ -257,6 +256,7 @@
                 [self hideSideWindow];
         }
     }
+    mwcFlags.updatingOutlineSelection = 0;
 }
 
 - (void)goToSelectedFindResults:(id)sender {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<ho...@us...>]

Revision: 16269
          http://sourceforge.net/p/skim-app/code/16269
Author:   hofman
Date:     2026-05-10 15:56:51 +0000 (Sun, 10 May 2026)
Log Message:
-----------
update overview selection with updatethumbnailselection flag set so we ignore selection change

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

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m	2026-05-10 15:41:52 UTC (rev 16268)
+++ trunk/SKMainWindowController_UI.m	2026-05-10 15:56:51 UTC (rev 16269)
@@ -373,6 +373,12 @@
     mwcFlags.updatingThumbnailSelection = 1;
     [leftSideController.thumbnailTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:pageIndex] byExtendingSelection:NO];
     [leftSideController.thumbnailTableView scrollRowToVisible:pageIndex];
+    
+    if (overviewView) {
+        [overviewView setSelectionIndexes:[NSIndexSet indexSetWithIndex:pageIndex]];
+        if ([self hasOverview])
+            [overviewView scrollRectToVisible:[overviewView frameForItemAtIndex:pageIndex]];
+    }
     mwcFlags.updatingThumbnailSelection = 0;
     
     [leftSideController.thumbnailTableView enumerateAvailableRowViewsUsingBlock:^(SKHighlightingTableRowView *rowView, NSInteger row){
@@ -2059,10 +2065,6 @@
     [self updateTocSelectionHighlights];
     [self updateNoteSelection];
     
-    [overviewView setSelectionIndexes:[NSIndexSet indexSetWithIndex:pageIndex]];
-    if ([self hasOverview])
-        [overviewView scrollRectToVisible:[overviewView frameForItemAtIndex:pageIndex]];
-    
     if (beforeMarkedPage.pageIndex != NSNotFound && [[pdfView currentPage] pageIndex] != markedPage.pageIndex)
         beforeMarkedPage.pageIndex = NSNotFound;
     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.