mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8365625: Can't change accelerator colors in Windows L&F
Reviewed-by: psadhukhan, kizune
This commit is contained in:
Alexey Ivanov
parent
a1be297911
commit
a1302e5fbc
@ -76,19 +76,20 @@ public final class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI {
|
||||
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,
|
||||
disabledForeground, acceleratorSelectionForeground,
|
||||
acceleratorForeground, 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,
|
||||
|
||||
@ -29,16 +29,11 @@ import java.awt.Color;
|
||||
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;
|
||||
@ -132,27 +127,6 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
|
||||
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}
|
||||
*/
|
||||
@ -165,15 +139,19 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
|
||||
changeListener = null;
|
||||
}
|
||||
|
||||
@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,
|
||||
disabledForeground, acceleratorSelectionForeground,
|
||||
acceleratorForeground, defaultTextIconGap, menuItem,
|
||||
WindowsMenuItemUI.paintMenuItem(accessor, g, c,
|
||||
checkIcon, arrowIcon,
|
||||
background, foreground,
|
||||
disabledForeground,
|
||||
acceleratorSelectionForeground,
|
||||
acceleratorForeground,
|
||||
defaultTextIconGap, menuItem,
|
||||
getPropertyPrefix());
|
||||
return;
|
||||
}
|
||||
@ -182,12 +160,16 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
|
||||
}
|
||||
|
||||
static void paintMenuItem(WindowsMenuItemUIAccessor accessor, Graphics g,
|
||||
JComponent c, Icon checkIcon, Icon arrowIcon,
|
||||
JComponent c,
|
||||
Icon checkIcon, Icon arrowIcon,
|
||||
Color background, Color foreground,
|
||||
Color disabledForeground,
|
||||
Color acceleratorSelectionForeground,
|
||||
Color acceleratorForeground,
|
||||
int defaultTextIconGap, JMenuItem menuItem, String prefix) {
|
||||
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();
|
||||
|
||||
@ -131,18 +131,20 @@ public final class WindowsMenuUI extends BasicMenuUI {
|
||||
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) {
|
||||
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,
|
||||
disabledForeground,
|
||||
acceleratorSelectionForeground,
|
||||
acceleratorForeground,
|
||||
defaultTextIconGap, menuItem,
|
||||
getPropertyPrefix());
|
||||
return;
|
||||
}
|
||||
|
||||
@ -76,19 +76,20 @@ public final class WindowsRadioButtonMenuItemUI extends BasicRadioButtonMenuItem
|
||||
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,
|
||||
disabledForeground, acceleratorSelectionForeground,
|
||||
acceleratorForeground, 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,
|
||||
|
||||
@ -0,0 +1,193 @@
|
||||
/*
|
||||
* Copyright (c) 2025, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.KeyEvent;
|
||||
|
||||
import javax.swing.Box;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JMenu;
|
||||
import javax.swing.JMenuBar;
|
||||
import javax.swing.JMenuItem;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.KeyStroke;
|
||||
import javax.swing.UIManager;
|
||||
|
||||
import static javax.swing.BorderFactory.createEmptyBorder;
|
||||
|
||||
/*
|
||||
* @test id=windows
|
||||
* @bug 8348760 8365375 8365389 8365625
|
||||
* @requires (os.family == "windows")
|
||||
* @summary Verify that Windows Look & Feel allows changing
|
||||
* accelerator colors
|
||||
* @library /java/awt/regtesthelpers
|
||||
* @build PassFailJFrame
|
||||
* @run main/manual MenuItemAcceleratorColor
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test id=classic
|
||||
* @bug 8348760 8365375 8365389 8365625
|
||||
* @requires (os.family == "windows")
|
||||
* @summary Verify that Windows Classic Look & Feel allows changing
|
||||
* accelerator colors
|
||||
* @library /java/awt/regtesthelpers
|
||||
* @build PassFailJFrame
|
||||
* @run main/manual MenuItemAcceleratorColor classic
|
||||
*/
|
||||
public final class MenuItemAcceleratorColor {
|
||||
private static final String INSTRUCTIONS =
|
||||
"Click the Menu to open it.\n" +
|
||||
"\n" +
|
||||
"Verify that the first and the last menu items render " +
|
||||
"their accelerators using the default colors, the color " +
|
||||
"should match that of the menu item itself in regular and " +
|
||||
"selected states.\n" +
|
||||
"\n" +
|
||||
"Verify that the second menu item renders its accelerator " +
|
||||
"with green and that the color changes to red when selected.\n" +
|
||||
"\n" +
|
||||
"Verify that the third menu item renders its accelerator " +
|
||||
"with magenta and yellow correspondingly.\n" +
|
||||
"\n" +
|
||||
"Verify that only the fifth menu item renders its accelerator " +
|
||||
"with blue; both the fourth and sixth should render their " +
|
||||
"accelerator with a shade of gray.\n" +
|
||||
"\n" +
|
||||
"If the above conditions are satisfied, press the Pass button; " +
|
||||
"otherwise, press the Fail button.";
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
UIManager.setLookAndFeel((args.length > 0 && "classic".equals(args[0]))
|
||||
? "com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel"
|
||||
: "com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
|
||||
|
||||
PassFailJFrame.builder()
|
||||
.instructions(INSTRUCTIONS)
|
||||
.rows(20)
|
||||
.columns(60)
|
||||
.testUI(MenuItemAcceleratorColor::createUI)
|
||||
.build()
|
||||
.awaitAndCheck();
|
||||
}
|
||||
|
||||
private static Box createInfoPanel() {
|
||||
Box box = Box.createVerticalBox();
|
||||
box.add(new JLabel("Look and Feel: "
|
||||
+ UIManager.getLookAndFeel()
|
||||
.getName()));
|
||||
box.add(new JLabel("Java version: "
|
||||
+ System.getProperty("java.runtime.version")));
|
||||
return box;
|
||||
}
|
||||
|
||||
private static JFrame createUI() {
|
||||
JPanel content = new JPanel(new BorderLayout());
|
||||
content.setBorder(createEmptyBorder(8, 8, 8, 8));
|
||||
content.add(createInfoPanel(),
|
||||
BorderLayout.SOUTH);
|
||||
|
||||
JFrame frame = new JFrame("Accelerator colors in Windows L&F");
|
||||
frame.setJMenuBar(createMenuBar());
|
||||
frame.add(content, BorderLayout.CENTER);
|
||||
frame.setSize(350, 370);
|
||||
return frame;
|
||||
}
|
||||
|
||||
private static JMenuBar createMenuBar() {
|
||||
JMenuItem first = new JMenuItem("First menu item");
|
||||
first.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F,
|
||||
InputEvent.CTRL_DOWN_MASK));
|
||||
|
||||
// Modify colors for accelerator rendering
|
||||
Color acceleratorForeground = UIManager.getColor("MenuItem.acceleratorForeground");
|
||||
Color acceleratorSelectionForeground = UIManager.getColor("MenuItem.acceleratorSelectionForeground");
|
||||
UIManager.put("MenuItem.acceleratorForeground", Color.GREEN);
|
||||
UIManager.put("MenuItem.acceleratorSelectionForeground", Color.RED);
|
||||
|
||||
JMenuItem second = new JMenuItem("Second menu item");
|
||||
second.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
|
||||
InputEvent.SHIFT_DOWN_MASK
|
||||
| InputEvent.CTRL_DOWN_MASK));
|
||||
|
||||
UIManager.put("MenuItem.acceleratorForeground", Color.MAGENTA);
|
||||
UIManager.put("MenuItem.acceleratorSelectionForeground", Color.YELLOW);
|
||||
JMenuItem third = new JMenuItem("Third menu item");
|
||||
third.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T,
|
||||
InputEvent.ALT_DOWN_MASK));
|
||||
|
||||
// Restore colors
|
||||
UIManager.put("MenuItem.acceleratorForeground", acceleratorForeground);
|
||||
UIManager.put("MenuItem.acceleratorSelectionForeground", acceleratorSelectionForeground);
|
||||
|
||||
|
||||
// Disabled foreground
|
||||
JMenuItem fourth = new JMenuItem("Fourth menu item");
|
||||
fourth.setEnabled(false);
|
||||
fourth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F,
|
||||
InputEvent.CTRL_DOWN_MASK));
|
||||
|
||||
Color disabledForeground = UIManager.getColor("MenuItem.disabledForeground");
|
||||
UIManager.put("MenuItem.disabledForeground", Color.BLUE);
|
||||
|
||||
JMenuItem fifth = new JMenuItem("Fifth menu item");
|
||||
fifth.setEnabled(false);
|
||||
fifth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F,
|
||||
InputEvent.CTRL_DOWN_MASK
|
||||
| InputEvent.SHIFT_DOWN_MASK));
|
||||
|
||||
// Restore disabled foreground
|
||||
UIManager.put("MenuItem.disabledForeground", disabledForeground);
|
||||
|
||||
JMenuItem sixth = new JMenuItem("Sixth menu item");
|
||||
sixth.setEnabled(false);
|
||||
sixth.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X,
|
||||
InputEvent.CTRL_DOWN_MASK
|
||||
| InputEvent.ALT_DOWN_MASK));
|
||||
|
||||
|
||||
JMenuItem quit = new JMenuItem("Quit");
|
||||
quit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
|
||||
InputEvent.CTRL_DOWN_MASK));
|
||||
|
||||
JMenu menu = new JMenu("Menu");
|
||||
menu.add(first);
|
||||
menu.add(second);
|
||||
menu.add(third);
|
||||
menu.addSeparator();
|
||||
menu.add(fourth);
|
||||
menu.add(fifth);
|
||||
menu.add(sixth);
|
||||
menu.addSeparator();
|
||||
menu.add(quit);
|
||||
|
||||
JMenuBar menuBar = new JMenuBar();
|
||||
menuBar.add(menu);
|
||||
|
||||
return menuBar;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user