jdk-sandbox: comparison jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java

equal deleted inserted replaced

-:726dedadcc44
+:d3620e28371c
 import javax.swing.border.*;
 import javax.swing.text.DefaultEditorKit;
 import java.awt.Font;
 import java.awt.Color;
-import java.awt.event.KeyEvent;
 import java.awt.event.ActionEvent;
 import java.security.AccessController;
 import sun.awt.SunToolkit;
 "win.text.grayedTextColor",
 table.get("textInactiveText"));
 Object ScrollbarBackgroundColor = new DesktopProperty(
 "win.scrollbar.backgroundColor",
 table.get("scrollbar"));
+Object buttonFocusColor = new FocusColorProperty();
 Object TextBackground         = new XPColorValue(Part.EP_EDIT, null, Prop.FILLCOLOR,
 WindowBackgroundColor);
 //The following four lines were commented out as part of bug 4991597
 //This code *is* correct, however it differs from WindowsXP and is, apparently
 "Button.darkShadow", ControlDarkShadowColor,
 "Button.light", ControlLightColor,
 "Button.highlight", ControlHighlightColor,
 "Button.disabledForeground", InactiveTextColor,
 "Button.disabledShadow", ControlHighlightColor,
-"Button.focus", black,
+"Button.focus", buttonFocusColor,
 "Button.dashedRectGapX", new XPValue(Integer.valueOf(3), Integer.valueOf(5)),
 "Button.dashedRectGapY", new XPValue(Integer.valueOf(3), Integer.valueOf(4)),
 "Button.dashedRectGapWidth", new XPValue(Integer.valueOf(6), Integer.valueOf(10)),
 "Button.dashedRectGapHeight", new XPValue(Integer.valueOf(6), Integer.valueOf(8)),
 "Button.textShiftOffset", new XPValue(Integer.valueOf(0),
 "CheckBox.foreground", WindowTextColor,
 "CheckBox.shadow", ControlShadowColor,
 "CheckBox.darkShadow", ControlDarkShadowColor,
 "CheckBox.light", ControlLightColor,
 "CheckBox.highlight", ControlHighlightColor,
-"CheckBox.focus", black,
+"CheckBox.focus", buttonFocusColor,
 "CheckBox.focusInputMap",
 new UIDefaults.LazyInputMap(new Object[] {
 "SPACE", "pressed",
 "released SPACE", "released"
 }),
 "RadioButton.foreground", WindowTextColor,
 "RadioButton.shadow", ControlShadowColor,
 "RadioButton.darkShadow", ControlDarkShadowColor,
 "RadioButton.light", ControlLightColor,
 "RadioButton.highlight", ControlHighlightColor,
-"RadioButton.focus", black,
+"RadioButton.focus", buttonFocusColor,
 "RadioButton.focusInputMap",
 new UIDefaults.LazyInputMap(new Object[] {
 "SPACE", "pressed",
 "released SPACE", "released"
 }),
 (int)(avg   * 255f);
 return rgbval;
 }
 }
+private static class FocusColorProperty extends DesktopProperty {
+public FocusColorProperty () {
+// Fallback value is never used bacause of the configureValue method doesn't return null
+super("win.3d.backgroundColor", Color.BLACK);
+}
+@Override
+protected Object configureValue(Object value) {
+if (! ((Boolean)Toolkit.getDefaultToolkit().getDesktopProperty("win.highContrast.on")).booleanValue()){
+return Color.BLACK;
+}
+return Color.BLACK.equals(value) ? Color.WHITE : Color.BLACK;
+}
+}
 }

changeset 11975	d3620e28371c
parent 10413	5bd4f81b6d45
child 13779	011727a60840