infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8318102: macos10.14 check in CSystemColors can be removed.

Browse Source 
Reviewed-by: prr, aivanov
This commit is contained in:
Prasanta Sadhukhan 2023-10-25 07:22:04 +00:00
parent 5ce718eb17
commit d7205e690f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m
View File

@ -96,11 +96,7 @@ JNI_COCOA_EXIT(env);
sColors[java_awt_SystemColor_TEXT_INACTIVE_TEXT] = [NSColor disabledControlTextColor];
sColors[java_awt_SystemColor_CONTROL] = [NSColor controlColor];
sColors[java_awt_SystemColor_CONTROL_TEXT] = [NSColor controlTextColor];
if (@available(macOS 10.14, *)) {
sColors[java_awt_SystemColor_CONTROL_HIGHLIGHT] = [NSColor selectedContentBackgroundColor];
} else {
sColors[java_awt_SystemColor_CONTROL_HIGHLIGHT] = [NSColor alternateSelectedControlColor];
}
sColors[java_awt_SystemColor_CONTROL_HIGHLIGHT] = [NSColor selectedContentBackgroundColor];
sColors[java_awt_SystemColor_CONTROL_LT_HIGHLIGHT] = [NSColor alternateSelectedControlTextColor];
sColors[java_awt_SystemColor_CONTROL_SHADOW] = [NSColor controlShadowColor];
sColors[java_awt_SystemColor_CONTROL_DK_SHADOW] = [NSColor controlDarkShadowColor];
@ -121,11 +117,7 @@ JNI_COCOA_EXIT(env);
}
// added for JTable Focus Ring
if (@available(macOS 10.14, *)) {
appleColors[sun_lwawt_macosx_LWCToolkit_CELL_HIGHLIGHT_COLOR] = [NSColor controlAccentColor];
} else {
appleColors[sun_lwawt_macosx_LWCToolkit_CELL_HIGHLIGHT_COLOR] = [NSColor keyboardFocusIndicatorColor];
}
appleColors[sun_lwawt_macosx_LWCToolkit_CELL_HIGHLIGHT_COLOR] = [NSColor controlAccentColor];
appleColors[sun_lwawt_macosx_LWCToolkit_KEYBOARD_FOCUS_COLOR] = [NSColor keyboardFocusIndicatorColor];
appleColors[sun_lwawt_macosx_LWCToolkit_INACTIVE_SELECTION_BACKGROUND_COLOR] = [NSColor secondarySelectedControlColor];
appleColors[sun_lwawt_macosx_LWCToolkit_INACTIVE_SELECTION_FOREGROUND_COLOR] = [NSColor controlDarkShadowColor];