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

8075785: The regression-swing case failed as colored text is not shown on disabled checkbox and radio button with the special options "-client -Dswing.defaultlaf=com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel"

Browse Source 
Reviewed-by: alexsch, serb, azvegint
This commit is contained in:
Semyon Sadetsky 2015-07-21 08:39:37 +03:00
parent f38b5fcc14
commit 3bc940fdaa
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -67,12 +67,12 @@ public class WindowsGraphicsUtils {
XPStyle xp = XPStyle.getXP();
if (xp != null && !(b instanceof JMenuItem)) {
paintXPText(b, g, textRect.x + textShiftOffset,
textRect.y + fm.getAscent() + textShiftOffset,
text, mnemIndex);
textRect.y + fm.getAscent() + textShiftOffset,
text, mnemIndex);
} else {
paintClassicText(b, g, textRect.x + textShiftOffset,
textRect.y + fm.getAscent() + textShiftOffset,
text, mnemIndex);
textRect.y + fm.getAscent() + textShiftOffset,
text, mnemIndex);
}
}
@ -95,7 +95,10 @@ public class WindowsGraphicsUtils {
}
SwingUtilities2.drawStringUnderlineCharAt(b, g,text, mnemIndex, x, y);
} else { /*** paint the text disabled ***/
color = UIManager.getColor("Button.shadow");
color = getDisabledTextColor(b);
if (color == null) {
color = UIManager.getColor("Button.shadow");
}
Color shadow = UIManager.getColor("Button.disabledShadow");
if(model.isArmed()) {
color = UIManager.getColor("Button.disabledForeground");
@ -115,6 +118,19 @@ public class WindowsGraphicsUtils {
}
}
private static Color getDisabledTextColor(AbstractButton b) {
if (b instanceof JCheckBox) {
return UIManager.getColor("CheckBox.disabledText");
} else if (b instanceof JRadioButton) {
return UIManager.getColor("RadioButton.disabledText");
} else if (b instanceof JToggleButton) {
return UIManager.getColor("ToggleButton.disabledText");
} else if (b instanceof JButton) {
return UIManager.getColor("Button.disabledText");
}
return null;
}
static void paintXPText(AbstractButton b, Graphics g, int x, int y,
String text, int mnemIndex) {
Part part = WindowsButtonUI.getXPButtonType(b);
@ -128,9 +144,15 @@ public class WindowsGraphicsUtils {
if (xp == null) {
return;
}
Color textColor = b.getForeground();
Color textColor;
if (b.isEnabled()) {
textColor = b.getForeground();
}
else {
textColor = getDisabledTextColor(b);
}
if (textColor instanceof UIResource) {
if (textColor == null || textColor instanceof UIResource) {
textColor = xp.getColor(b, part, state, Prop.TEXTCOLOR, b.getForeground());
// to work around an apparent bug in Windows, use the pushbutton
// color for disabled toolbar buttons if the disabled color is the