colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-09 18:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

TableView:

Browse Source 
Set a CPThemeStateHighlighted for both selecting and sorting.
Do not change sort descriptors when selecting with a modifier flag.

Conflicts:

	AppKit/CPTableView.j
This commit is contained in:
Randall Luecke committed 2010-02-14 21:33:20 -05:00
1 parent 5131aff352
commit 4237000fc9
3 files changed
+43 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPTableHeaderView.j
+5 -12
View File
@@ -56,9 +56,9 @@ var CPThemeStatePressed = CPThemeState("pressed");
{
var themeState = [self themeState];
if((themeState & CPThemeStateSelected || themeState & CPThemeStateHighlighted) && (themeState & CPThemeStatePressed))
if(themeState & CPThemeStateHighlighted && themeState & CPThemeStatePressed)
[self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted-pressed.png", CGSizeMake(1.0, 22.0))]];
else if (themeState & CPThemeStateSelected || themeState & CPThemeStateHighlighted)
else if (themeState & CPThemeStateHighlighted)
[self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted.png", CGSizeMake(1.0, 22.0))]];
else if (themeState & CPThemeStatePressed)
[self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-pressed.png", CGSizeMake(1.0, 22.0))]];
@@ -230,18 +230,11 @@ var CPThemeStatePressed = CPThemeState("pressed");
var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
clickedColumn = [self columnAtPoint:location];
[self _setPressedColumn:CPNotFound];
[self _setPressedColumn:-1];
if (clickedColumn == -1)
return;
if (clickedColumn != -1)
[_tableView _didClickTableColumn:clickedColumn modifierFlags:[theEvent modifierFlags]];
[_tableView _sendDelegateDidClickColumn:clickedColumn];
if ([_tableView allowsColumnSelection])
[_tableView _selectTableColumn:clickedColumn modifierFlags:[theEvent modifierFlags]];
[_tableView _changeSortDescriptorsForClickOnColumn:clickedColumn];
return;
}
/*