Revision: 12723
http://sourceforge.net/p/skim-app/code/12723
Author: hofman
Date: 2022-01-19 17:37:34 +0000 (Wed, 19 Jan 2022)
Log Message:
-----------
Make sure there is a row to calculate width offset
Modified Paths:
--------------
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2022-01-19 17:17:17 UTC (rev 12722)
+++ trunk/SKMainWindowController_UI.m 2022-01-19 17:37:34 UTC (rev 12723)
@@ -860,7 +860,7 @@
if (mwcFlags.autoResizeNoteRows &&
[ov isEqual:rightSideController.noteOutlineView] &&
[[tableColumn identifier] isEqualToString:NOTE_COLUMNID]) {
- if (noteColumnWidthOffset <= 0.0 && [tableColumn isHidden] == NO)
+ if (noteColumnWidthOffset <= 0.0 && [tableColumn isHidden] == NO &&
[ov numberOfRows] > 0)
noteColumnWidthOffset = [tableColumn width] - NSWidth([ov
frameOfCellAtColumn:[[ov tableColumns] indexOfObject:tableColumn] row:0]);
[rowHeights removeAllFloats];
[rightSideController.noteOutlineView
noteHeightOfRowsChangedAnimating:NO];
@@ -1195,7 +1195,7 @@
// which depends on the style and the OS version
NSOutlineView *ov = rightSideController.noteOutlineView;
NSTableColumn *tc = [ov tableColumnWithIdentifier:NOTE_COLUMNID];
- if ([tc isHidden] == NO)
+ if ([tc isHidden] == NO && [ov numberOfRows] > 0)
noteColumnWidthOffset = [tc width] - NSWidth([ov
frameOfCellAtColumn:[[ov tableColumns] indexOfObject:tc] row:0]);
}
mwcFlags.autoResizeNoteRows = (0 == mwcFlags.autoResizeNoteRows);
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2022-01-19 17:17:17 UTC (rev 12722)
+++ trunk/SKNotesDocument.m 2022-01-19 17:37:34 UTC (rev 12723)
@@ -584,7 +584,7 @@
}
- (void)toggleAutoResizeNoteRows:(id)sender {
- if (noteColumnWidthOffset <= 0.0 && ndFlags.autoResizeRows == 0) {
+ if (noteColumnWidthOffset <= 0.0 && ndFlags.autoResizeRows == 0 &&
[outlineView numberOfRows] > 0) {
NSTableColumn *tc = [outlineView
tableColumnWithIdentifier:NOTE_COLUMNID];
if ([tc isHidden] == NO)
noteColumnWidthOffset = [tc width] - NSWidth([outlineView
frameOfCellAtColumn:[[outlineView tableColumns] indexOfObject:tc] row:0]);
@@ -764,7 +764,7 @@
- (void)outlineView:(NSOutlineView *)ov
didChangeHiddenOfTableColumn:(NSTableColumn *)tableColumn {
if (ndFlags.autoResizeRows &&
[[tableColumn identifier] isEqualToString:NOTE_COLUMNID]) {
- if (noteColumnWidthOffset <= 0.0 && [tableColumn isHidden] == NO)
+ if (noteColumnWidthOffset <= 0.0 && [tableColumn isHidden] == NO &&
[outlineView numberOfRows] > 0)
noteColumnWidthOffset = [tableColumn width] - NSWidth([ov
frameOfCellAtColumn:[[ov tableColumns] indexOfObject:tableColumn] row:0]);
[rowHeights removeAllFloats];
[outlineView noteHeightOfRowsChangedAnimating:NO];
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
