Skip to content

8365625: Can't change accelerator colors in Windows L&F #26826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+214 −106
Open

8365625: Can't change accelerator colors in Windows L&F #26826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f991a86
8365389
prrace Aug 14, 2025
a1f59db
8365389
prrace Aug 14, 2025
d4286bc
8365625: Can't change accelerator colors in Windows L&F
aivanov-jdk Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ public class SwingUtilities3 {
private static final Object DELEGATE_REPAINT_MANAGER_KEY =
new StringBuilder("DelegateRepaintManagerKey");

private static Color disabledForeground;
private static Color acceleratorSelectionForeground;
private static Color acceleratorForeground;

/**
* Registers delegate RepaintManager for {@code JComponent}.
*/
Expand Down Expand Up @@ -204,7 +200,10 @@ public static void paintIcon(Graphics g, MenuItemLayoutHelper lh,


public static void paintAccText(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr) {
MenuItemLayoutHelper.LayoutResult lr,
Color disabledForeground,
Color acceleratorSelectionForeground,
Color acceleratorForeground) {
if (!lh.getAccText().isEmpty()) {
ButtonModel model = lh.getMenuItem().getModel();
g.setFont(lh.getAccFontMetrics().getFont());
Expand Down Expand Up @@ -243,18 +242,6 @@ public static void paintAccText(Graphics g, MenuItemLayoutHelper lh,
}
}

public static void setDisabledForeground(Color disabledFg) {
disabledForeground = disabledFg;
}

public static void setAcceleratorSelectionForeground(Color acceleratorSelectionFg) {
acceleratorSelectionForeground = acceleratorSelectionFg;
}

public static void setAcceleratorForeground(Color acceleratorFg) {
acceleratorForeground = acceleratorFg;
}

public static void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr,
Color foreground) {
Expand Down
9 changes: 4 additions & 5 deletions src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,11 +716,10 @@ private void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,

private void paintAccText(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr) {
SwingUtilities3.setDisabledForeground(disabledForeground);
SwingUtilities3.setAcceleratorSelectionForeground(
acceleratorSelectionForeground);
SwingUtilities3.setAcceleratorForeground(acceleratorForeground);
SwingUtilities3.paintAccText(g, lh, lr);
SwingUtilities3.paintAccText(g, lh, lr,
disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground);
}

private void paintText(Graphics g, MenuItemLayoutHelper lh,
Expand Down
15 changes: 9 additions & 6 deletions ...va.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,20 @@ protected void paintBackground(Graphics g, JMenuItem menuItem,
super.paintBackground(g, menuItem, bgColor);
}

/**
* Paint MenuItem.
*/
@Override
protected void paintMenuItem(Graphics g, JComponent c,
Icon checkIcon, Icon arrowIcon,
Color background, Color foreground,
int defaultTextIconGap) {
if (WindowsMenuItemUI.isVistaPainting()) {
WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
arrowIcon, background, foreground, defaultTextIconGap,
menuItem, getPropertyPrefix());
WindowsMenuItemUI.paintMenuItem(accessor, g, c,
checkIcon, arrowIcon,
background, foreground,
disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground,
defaultTextIconGap,
menuItem, getPropertyPrefix());
return;
}
super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
Expand Down
91 changes: 23 additions & 68 deletions src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Rectangle;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Enumeration;

import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.ButtonModel;
import javax.swing.DefaultButtonModel;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JMenu;
Expand Down Expand Up @@ -67,9 +62,6 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
* The instance of {@code PropertyChangeListener}.
*/
private PropertyChangeListener changeListener;
private static Color disabledForeground;
private static Color acceleratorSelectionForeground;
private static Color acceleratorForeground;

final WindowsMenuItemUIAccessor accessor =
new WindowsMenuItemUIAccessor() {
Expand Down Expand Up @@ -134,27 +126,6 @@ public void propertyChange(PropertyChangeEvent e) {
menuItem.addPropertyChangeListener(changeListener);
}

protected void installDefaults() {
super.installDefaults();
String prefix = getPropertyPrefix();

if (acceleratorSelectionForeground == null ||
acceleratorSelectionForeground instanceof UIResource) {
acceleratorSelectionForeground =
UIManager.getColor(prefix + ".acceleratorSelectionForeground");
}
if (acceleratorForeground == null ||
acceleratorForeground instanceof UIResource) {
acceleratorForeground =
UIManager.getColor(prefix + ".acceleratorForeground");
}
if (disabledForeground == null ||
disabledForeground instanceof UIResource) {
disabledForeground =
UIManager.getColor(prefix + ".disabledForeground");
}
}

/**
* {@inheritDoc}
*/
Expand All @@ -167,43 +138,18 @@ protected void uninstallListeners() {
changeListener = null;
}

private static void applyInsets(Rectangle rect, Insets insets) {
SwingUtilities3.applyInsets(rect, insets);
}

private static void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr,
Color holdc, Color foreground) {
SwingUtilities3.paintCheckIcon(g, lh, lr, holdc, foreground);
}

private static void paintIcon(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr, Color holdc) {
SwingUtilities3.paintIcon(g, lh, lr, holdc);
}

private static void paintAccText(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr) {
SwingUtilities3.setDisabledForeground(disabledForeground);
SwingUtilities3.setAcceleratorSelectionForeground(
acceleratorSelectionForeground);
SwingUtilities3.setAcceleratorForeground(acceleratorForeground);
SwingUtilities3.paintAccText(g, lh, lr);
}

private static void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
MenuItemLayoutHelper.LayoutResult lr,
Color foreground) {
SwingUtilities3.paintArrowIcon(g, lh, lr, foreground);
}

@Override
protected void paintMenuItem(Graphics g, JComponent c,
Icon checkIcon, Icon arrowIcon,
Color background, Color foreground,
int defaultTextIconGap) {
if (WindowsMenuItemUI.isVistaPainting()) {
WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
arrowIcon, background, foreground,
WindowsMenuItemUI.paintMenuItem(accessor, g, c,
checkIcon, arrowIcon,
background, foreground,
disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground,
defaultTextIconGap, menuItem,
getPropertyPrefix());
return;
Expand All @@ -213,9 +159,16 @@ protected void paintMenuItem(Graphics g, JComponent c,
}

static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
JComponent c, Icon checkIcon, Icon arrowIcon,
JComponent c,
Icon checkIcon, Icon arrowIcon,
Color background, Color foreground,
int defaultTextIconGap, JMenuItem menuItem, String prefix) {
Color disabledForeground,
Color acceleratorSelectionForeground,
Color acceleratorForeground,
int defaultTextIconGap, JMenuItem menuItem,
String prefix) {
assert c == menuItem : "menuItem passed as 'c' must be the same";

// Save original graphics font and color
Font holdf = g.getFont();
Color holdc = g.getColor();
Expand All @@ -224,7 +177,7 @@ static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
g.setFont(mi.getFont());

Rectangle viewRect = new Rectangle(0, 0, mi.getWidth(), mi.getHeight());
applyInsets(viewRect, mi.getInsets());
SwingUtilities3.applyInsets(viewRect, mi.getInsets());

String acceleratorDelimiter =
UIManager.getString("MenuItem.acceleratorDelimiter");
Expand All @@ -242,8 +195,8 @@ static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
MenuItemLayoutHelper.LayoutResult lr = lh.layoutMenuItem();

paintBackground(accessor, g, mi, background);
paintCheckIcon(g, lh, lr, holdc, foreground);
paintIcon(g, lh, lr, holdc);
SwingUtilities3.paintCheckIcon(g, lh, lr, holdc, foreground);
SwingUtilities3.paintIcon(g, lh, lr, holdc);

if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
Rectangle rect = lr.getTextRect();
Expand All @@ -267,8 +220,10 @@ static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
rect.x += lh.getAfterCheckIconGap();
lr.setAccRect(rect);
}
paintAccText(g, lh, lr);
paintArrowIcon(g, lh, lr, foreground);
SwingUtilities3.paintAccText(g, lh, lr, disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground);
SwingUtilities3.paintArrowIcon(g, lh, lr, foreground);

// Restore original graphics font and color
g.setColor(holdc);
Expand Down
11 changes: 7 additions & 4 deletions src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,19 @@ protected void installDefaults() {
hotTrackingOn = (obj instanceof Boolean) ? (Boolean)obj : true;
}

/**
* Paint MenuItem.
*/
@Override
protected void paintMenuItem(Graphics g, JComponent c,
Icon checkIcon, Icon arrowIcon,
Color background, Color foreground,
int defaultTextIconGap) {
assert c == menuItem : "menuItem passed as 'c' must be the same";
if (WindowsMenuItemUI.isVistaPainting()) {
WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon, arrowIcon,
WindowsMenuItemUI.paintMenuItem(accessor, g, c,
checkIcon, arrowIcon,
background, foreground,
disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground,
defaultTextIconGap, menuItem,
getPropertyPrefix());
return;
Expand Down
15 changes: 9 additions & 6 deletions ...desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,20 @@ protected void paintBackground(Graphics g, JMenuItem menuItem,
super.paintBackground(g, menuItem, bgColor);
}

/**
* Paint MenuItem.
*/
@Override
protected void paintMenuItem(Graphics g, JComponent c,
Icon checkIcon, Icon arrowIcon,
Color background, Color foreground,
int defaultTextIconGap) {
if (WindowsMenuItemUI.isVistaPainting()) {
WindowsMenuItemUI.paintMenuItem(accessor, g, c, checkIcon,
arrowIcon, background, foreground, defaultTextIconGap,
menuItem, getPropertyPrefix());
WindowsMenuItemUI.paintMenuItem(accessor, g, c,
checkIcon, arrowIcon,
background, foreground,
disabledForeground,
acceleratorSelectionForeground,
acceleratorForeground,
defaultTextIconGap,
menuItem, getPropertyPrefix());
return;
}
super.paintMenuItem(g, c, checkIcon, arrowIcon, background,
Expand Down
Loading