darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-23 20:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimized -[NSTableView drawGridInClipRect:]

Browse Source 
corrected vertical position of table header and table corner drawing by NSGraphicsStyle_uxtheme -- was off by 1px to the top
This commit is contained in:
Rolf 2015-08-17 17:48:19 -03:00
parent eb0d31acbd
commit 21b7b3e767
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
AppKit/NSTableView.m
View File

@ -1233,42 +1233,48 @@ _dataSource);
// Verified by comparing screen shots on Mac OS X 10.4.10.
- (void)drawGridInClipRect:(NSRect)clipRect {
NSBezierPath *line = [NSBezierPath bezierPath];
NSInteger i;
NSInteger i, n;
float x, y;
[_gridColor setStroke];
if ((_gridStyleMask & NSTableViewSolidVerticalGridLineMask) ==
NSTableViewSolidVerticalGridLineMask) {
if ((_gridStyleMask & NSTableViewSolidVerticalGridLineMask) == NSTableViewSolidVerticalGridLineMask)
{
NSRange rangeOfColumns = [self columnsInRect:clipRect];
for (i = rangeOfColumns.location; i < rangeOfColumns.location + rangeOfColumns.length; i++) {
n = rangeOfColumns.location + rangeOfColumns.length;
for (i = rangeOfColumns.location; i < n; i++)
{
NSRect columnRect = [self rectOfColumn:i];
float xToDraw = columnRect.origin.x + columnRect.size.width - 0.5;
[line moveToPoint:NSMakePoint(xToDraw, clipRect.origin.y)];
[line lineToPoint:NSMakePoint(xToDraw, clipRect.origin.y + clipRect.size.height)];
x = columnRect.origin.x + columnRect.size.width + ((i < n-1) ? -0.5 : 0.5);
y = clipRect.origin.y;
[line moveToPoint:NSMakePoint(x, y)];
[line lineToPoint:NSMakePoint(x, y + clipRect.size.height)];
}
}
if ((_gridStyleMask & NSTableViewSolidHorizontalGridLineMask) ==
NSTableViewSolidHorizontalGridLineMask) {
NSRange rangeOfRows = [self rowsInRect:clipRect];
float yToDraw = -0.5;
if ((_gridStyleMask & NSTableViewSolidHorizontalGridLineMask) == NSTableViewSolidHorizontalGridLineMask)
{
NSRange rangeOfRows = [self rowsInRect:clipRect];
n = rangeOfRows.location + rangeOfRows.length;
y = -0.5;
for (i = rangeOfRows.location; i < n; i++)
{
NSRect rowRect = [self rectOfRow:i];
x = clipRect.origin.x;
y = rowRect.origin.y + rowRect.size.height - 0.5;
[line moveToPoint:NSMakePoint(x, y)];
[line lineToPoint:NSMakePoint(x + clipRect.size.width, y)];
}
for (i = rangeOfRows.location; i < rangeOfRows.location + rangeOfRows.length; i++) {
NSRect rowRect = [self rectOfRow:i];
yToDraw = rowRect.origin.y + rowRect.size.height - 0.5;
[line moveToPoint:NSMakePoint(clipRect.origin.x, yToDraw)];
[line lineToPoint:NSMakePoint(clipRect.origin.x + clipRect.size.width, yToDraw)];
}
if (_standardRowHeight > 0.) {
while (yToDraw < clipRect.size.height) {
yToDraw += _standardRowHeight + _intercellSpacing.height;
[line moveToPoint:NSMakePoint(clipRect.origin.x, yToDraw)];
[line lineToPoint:NSMakePoint(clipRect.origin.x + clipRect.size.width, yToDraw)];
}
}
if (_standardRowHeight > 0.0)
{
while (y < clipRect.size.height)
{
y += _standardRowHeight + _intercellSpacing.height;
[line moveToPoint:NSMakePoint(clipRect.origin.x, y)];
[line lineToPoint:NSMakePoint(clipRect.origin.x + clipRect.size.width, y)];
}
}
}
[line stroke];

2
AppKit/Win32.subproj/NSGraphicsStyle_uxtheme.m
View File

@ -784,11 +784,13 @@ static inline RECT transformToRECT(O2AffineTransform matrix,NSRect rect) {
@implementation NSGraphicsStyle_uxtheme (NSTableView)
-(void)drawTableViewHeaderInRect:(NSRect)rect highlighted:(BOOL)highlighted {
rect.origin.y -= 1.0;
if(![self drawPartId:HP_HEADERITEM stateId:highlighted?HIS_PRESSED:HIS_NORMAL uxthClassId:uxthHEADER inRect:rect])
[super drawTableViewHeaderInRect:rect highlighted:highlighted];
}
-(void)drawTableViewCornerInRect:(NSRect)rect {
rect.origin.y -= 1.0;
if(![self drawPartId:HP_HEADERITEM stateId:HIS_NORMAL uxthClassId:uxthHEADER inRect:rect])
[super drawTableViewCornerInRect:rect];
}