cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use custom colors in selected wxDVC controls (wxOSX)

Browse Source 
Don't use custom color attributes or color markup for rendering of
selected items' text in wxOSX's wxDataViewCtrl and use the selection
text color instead. This is consistent with the other ports and should
be done to improve readability (in absence of selection-specific
attributes).
This commit is contained in:
Václav Slavík 2016-10-19 16:59:07 +02:00 committed by Václav Slavík
parent 5e5ffad0b8
commit d9df970573
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/dataview.mm
View File

@ -2733,7 +2733,7 @@ void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& attr)
//else: can't change font if the cell doesn't have any
}
if ( attr.HasColour() )
if ( attr.HasColour() && ![cell isHighlighted] )
{
// we can set font for any cell but only NSTextFieldCell provides
// a method for setting text colour so check that this method is
@ -2842,6 +2842,12 @@ bool wxDataViewTextRenderer::MacRender()
[par release];
}
if ( [cell isHighlighted] )
{
[str removeAttribute:NSForegroundColorAttributeName range:NSMakeRange(0, [str length])];
[str removeAttribute:NSBackgroundColorAttributeName range:NSMakeRange(0, [str length])];
}
[cell setAttributedStringValue:str];
return true;
}