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

Merge branch 'pr_fix_macos_hotlight_color' of https://github.com/obfuscated/wxWidgets

Browse Source 
Implement wxSYS_COLOUR_HOTLIGHT on macOS.

See https://github.com/wxWidgets/wxWidgets/pull/1841
This commit is contained in:
Vadim Zeitlin
2020-05-28 01:24:56 +02:00
parent 07e36f9bbf e60d43c21e
commit 52eec83245
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,8 +163,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
sysColor = [NSColor windowBackgroundColor]; sysColor = [NSColor windowBackgroundColor];
break; break;
case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_HOTLIGHT:
// OSX doesn't change color on mouse hover #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
sysColor = [NSColor controlTextColor]; if ( WX_IS_MACOS_AVAILABLE(10, 10) )
{
sysColor = [NSColor linkColor];
}
else
#endif
{
// OSX doesn't change color on mouse hover
sysColor = [NSColor controlTextColor];
}
break; break;
case wxSYS_COLOUR_MENUHILIGHT: case wxSYS_COLOUR_MENUHILIGHT:
sysColor = [NSColor selectedMenuItemColor]; sysColor = [NSColor selectedMenuItemColor];