diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index f098b4eaa..993acd22d 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -70,7 +70,10 @@ CPTableColumnUserResizingMask = 2; _maxWidth = 1000000.0; [self setIdentifier:anIdentifier]; - [self setHeaderView:[CPTextField new]]; + + var header = [CPTextField new]; + [header setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 23.0))]]; + [self setHeaderView:header]; var textDataView = [CPTextField new]; [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted]; @@ -81,6 +84,7 @@ CPTableColumnUserResizingMask = 2; return self; } + - (void)setTableView:(CPTableView)aTableView { _tableView = aTableView; diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index 2be231527..061a3b2eb 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -135,8 +135,8 @@ var columnToStroke = [self headerRectOfColumn:columnArrayIndex]; CGContextBeginPath(context); - CGContextMoveToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y) - 0.5); - CGContextAddLineToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) - 0.5, ROUND(columnToStroke.origin.y + columnToStroke.size.height) - 0.5); + CGContextMoveToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) + 0.5, ROUND(columnToStroke.origin.y) + 0.5); + CGContextAddLineToPoint(context, ROUND(columnToStroke.origin.x + columnToStroke.size.width) + 0.5, ROUND(columnToStroke.origin.y + columnToStroke.size.height) + 0.5); CGContextSetLineWidth(context, 1); CGContextStrokePath(context); } diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 716cce3a5..43da901b4 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -226,7 +226,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5; _exposedColumns = [CPIndexSet indexSet]; _cachedDataViews = { }; _intercellSpacing = _CGSizeMake(0.0, 0.0); - _rowHeight = 19.0; + _rowHeight = 23.0; [self setSelectionHightlightColor:[CPColor selectionColor]]; [self setGridColor:[CPColor grayColor]]; diff --git a/AppKit/Themes/Aristo/Resources/tableview-headerview-highlighted.png b/AppKit/Themes/Aristo/Resources/tableview-headerview-highlighted.png new file mode 100644 index 000000000..6596e48d8 Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/tableview-headerview-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/tableview-headerview.png b/AppKit/Themes/Aristo/Resources/tableview-headerview.png new file mode 100644 index 000000000..357bbc85b Binary files /dev/null and b/AppKit/Themes/Aristo/Resources/tableview-headerview.png differ diff --git a/AppKit/_CPCornerView.j b/AppKit/_CPCornerView.j index 5a30dfc90..633e1bcac 100644 --- a/AppKit/_CPCornerView.j +++ b/AppKit/_CPCornerView.j @@ -9,7 +9,7 @@ { if (self = [super initWithFrame:aFrame]) { - [self setBackgroundColor:[CPColor purpleColor]]; + [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 23.0))]]; } return self;