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

Use better approximation for gradient caption colors

Browse Source 
Caption color is a better choice than black
This commit is contained in:
Paul Cornett
2017-12-10 10:00:05 -08:00
parent fcf21e61db
commit 67a28b7968
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/settings.cpp
View File

@@ -440,13 +440,18 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
{ {
case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
#if GTK_CHECK_VERSION(3,10,0) #if GTK_CHECK_VERSION(3,10,0)
if (gtk_check_version(3,10,0) == NULL) if (gtk_check_version(3,10,0) == NULL)
{ {
sc = HeaderbarContext(path); sc = HeaderbarContext(path);
int state = GTK_STATE_FLAG_NORMAL; int state = GTK_STATE_FLAG_NORMAL;
if (index == wxSYS_COLOUR_INACTIVECAPTION) if (index == wxSYS_COLOUR_INACTIVECAPTION ||
index == wxSYS_COLOUR_GRADIENTINACTIVECAPTION)
{
state = GTK_STATE_FLAG_BACKDROP; state = GTK_STATE_FLAG_BACKDROP;
}
bg(sc, color, state); bg(sc, color, state);
break; break;
} }
@@ -574,8 +579,6 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
bg(sc, color); bg(sc, color);
break; break;
case wxSYS_COLOUR_3DDKSHADOW: case wxSYS_COLOUR_3DDKSHADOW:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
color.Set(0, 0, 0); color.Set(0, 0, 0);
break; break;
default: default:
@@ -628,6 +631,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_BACKGROUND: case wxSYS_COLOUR_BACKGROUND:
//case wxSYS_COLOUR_DESKTOP: //case wxSYS_COLOUR_DESKTOP:
case wxSYS_COLOUR_INACTIVECAPTION: case wxSYS_COLOUR_INACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
case wxSYS_COLOUR_MENU: case wxSYS_COLOUR_MENU:
case wxSYS_COLOUR_WINDOWFRAME: case wxSYS_COLOUR_WINDOWFRAME:
case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_ACTIVEBORDER:
@@ -712,13 +716,12 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
break; break;
case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_MENUHILIGHT: case wxSYS_COLOUR_MENUHILIGHT:
color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]); color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]);
break; break;
case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_HOTLIGHT:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
// TODO // TODO
color = *wxBLACK; color = *wxBLACK;
break; break;