Revision: 12727
http://sourceforge.net/p/skim-app/code/12727
Author: hofman
Date: 2022-01-20 15:17:46 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
use default values for width offset when not set
Modified Paths:
--------------
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2022-01-20 10:42:56 UTC (rev 12726)
+++ trunk/SKMainWindowController_UI.m 2022-01-20 15:17:46 UTC (rev 12727)
@@ -121,6 +121,8 @@
static CGFloat noteColumnWidthOffset = 0.0;
+#define NOTE_COLUMN_WIDTH_OFFSET (noteColumnWidthOffset > 0.0 ?
noteColumnWidthOffset : RUNNING_AFTER(10_15) ? 9.0 : 16.0)
+
@interface SKMainWindowController (SKPrivateMain)
- (void)cleanup;
@@ -885,10 +887,10 @@
}
width -= spacing + [ov indentationPerLevel];
if ([tableColumn isHidden] == NO && tableColumn == [[ov
tableColumns] firstObject])
- width -= noteColumnWidthOffset;
+ width -= NOTE_COLUMN_WIDTH_OFFSET;
width = fmax(10.0, width);
} else if ([tableColumn isHidden] == NO) {
- width = [tableColumn width] - noteColumnWidthOffset;
+ width = [tableColumn width] - NOTE_COLUMN_WIDTH_OFFSET;
}
if (width > 0.0)
rowHeight = [cell cellSizeForBounds:NSMakeRect(0.0, 0.0,
width, CGFLOAT_MAX)].height;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2022-01-20 10:42:56 UTC (rev 12726)
+++ trunk/SKNotesDocument.m 2022-01-20 15:17:46 UTC (rev 12727)
@@ -100,6 +100,8 @@
static CGFloat noteColumnWidthOffset = 0.0;
+#define NOTE_COLUMN_WIDTH_OFFSET (noteColumnWidthOffset > 0.0 ?
noteColumnWidthOffset : RUNNING_AFTER(10_15) ? 9.0 : 16.0)
+
@implementation SKNotesDocument
@synthesize outlineView, statusBar, arrayController, searchField, notes,
pdfDocument, sourceFileURL;
@@ -825,10 +827,10 @@
}
width -= spacing + [outlineView indentationPerLevel];
if ([tableColumn isHidden] == NO && tableColumn == [[ov
tableColumns] firstObject])
- width -= noteColumnWidthOffset;
+ width -= NOTE_COLUMN_WIDTH_OFFSET;
width = fmax(10.0, width);
} else if ([tableColumn isHidden] == NO) {
- width = NSWidth([ov frameOfCellAtColumn:[[outlineView
tableColumns] indexOfObject:tableColumn] row:0]);
+ width = [tableColumn width] - NOTE_COLUMN_WIDTH_OFFSET;
}
if (width > 0.0)
rowHeight = [cell cellSizeForBounds:NSMakeRect(0.0, 0.0,
width, CGFLOAT_MAX)].height;
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
