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

Merge branch 'grid-colours'

Browse Source 
Fix colours of wxGrid cursor after a recent regression.

See https://github.com/wxWidgets/wxWidgets/pull/2378

Closes #18941.
This commit is contained in:
Vadim Zeitlin
2021-05-31 16:28:28 +02:00
parent f1d84277b4 c31b32d756
commit 82ebbe880a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/grid.cpp
View File

@@ -312,7 +312,7 @@ void wxGridRowHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW))); dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine(rect.GetRight(), rect.GetTop(), dc.DrawLine(rect.GetRight(), rect.GetTop(),
rect.GetRight(), rect.GetBottom()); rect.GetRight(), rect.GetBottom());
@@ -344,7 +344,7 @@ void wxGridColumnHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW))); dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine(rect.GetRight(), rect.GetTop(), dc.DrawLine(rect.GetRight(), rect.GetTop(),
rect.GetRight(), rect.GetBottom()); rect.GetRight(), rect.GetBottom());
dc.DrawLine(rect.GetLeft(), rect.GetBottom(), dc.DrawLine(rect.GetLeft(), rect.GetBottom(),
@@ -373,7 +373,7 @@ void wxGridCornerHeaderRendererDefault::DrawBorder(const wxGrid& grid,
wxDC& dc, wxDC& dc,
wxRect& rect) const wxRect& rect) const
{ {
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW))); dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)));
dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1, dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1,
rect.GetRight() - 1, rect.GetTop()); rect.GetRight() - 1, rect.GetTop());
dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1, dc.DrawLine(rect.GetRight() - 1, rect.GetBottom() - 1,
@@ -3012,7 +3012,7 @@ void wxGrid::Init()
m_gridLinesEnabled = true; m_gridLinesEnabled = true;
m_gridLinesClipHorz = m_gridLinesClipHorz =
m_gridLinesClipVert = true; m_gridLinesClipVert = true;
m_cellHighlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_cellHighlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
m_cellHighlightPenWidth = 2; m_cellHighlightPenWidth = 2;
m_cellHighlightROPenWidth = 1; m_cellHighlightROPenWidth = 1;
if ( wxSystemSettings::GetAppearance().IsDark() ) if ( wxSystemSettings::GetAppearance().IsDark() )

4
src/osx/cocoa/settings.mm
View File

@@ -122,6 +122,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
sysColor = [NSColor controlBackgroundColor]; sysColor = [NSColor controlBackgroundColor];
break; break;
case wxSYS_COLOUR_BTNSHADOW: case wxSYS_COLOUR_BTNSHADOW:
case wxSYS_COLOUR_3DDKSHADOW:
sysColor = [NSColor controlShadowColor]; sysColor = [NSColor controlShadowColor];
break; break;
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
@@ -142,9 +143,6 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_GRAYTEXT:
sysColor = [NSColor disabledControlTextColor]; sysColor = [NSColor disabledControlTextColor];
break; break;
case wxSYS_COLOUR_3DDKSHADOW:
sysColor = [NSColor controlShadowColor];
break;
case wxSYS_COLOUR_3DLIGHT: case wxSYS_COLOUR_3DLIGHT:
sysColor = [NSColor controlHighlightColor]; sysColor = [NSColor controlHighlightColor];
break; break;