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

8372103: Metal JButton doesn't show focus if no text or icon

Browse Source 
Reviewed-by: azvegint, tr
This commit is contained in:
Prasanta Sadhukhan 2025-11-25 11:39:25 +00:00
parent c19b12927d
commit 49176e322b
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -217,6 +217,13 @@ public class MetalButtonUI extends BasicButtonUI {
// If there is an icon and no text
else if ( isIcon ) {
focusRect.setBounds( iconRect );
} else {
Rectangle emptyRect = new Rectangle();
emptyRect.x = 5;
emptyRect.y = 5;
emptyRect.width = b.getWidth() - emptyRect.x * 2;
emptyRect.height = b.getHeight() - emptyRect.y * 2;
focusRect.setBounds(emptyRect);
}
g.setColor(getFocusColor());

74
test/jdk/javax/swing/plaf/metal/MetalFocusBug.java Normal file
View File

@ -0,0 +1,74 @@
/*
* 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.
*/
/*
* @test
* @bug 8372103
* @summary Verifies Metal JButton show focus even if there's no text or icon
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual MetalFocusBug
*/
import java.awt.Color;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.plaf.ColorUIResource;
import javax.swing.UIManager;
public class MetalFocusBug {
static final String INSTRUCTIONS = """
A JFrame is shown with 2 JButtons.
A button "Top" at TOP and
another button with empty text and without icon at the bottom.
Initially the focus is at the "TOP" button.
Verify that Red color focus rectangle is around the "TOP" text.
Press "Tab" key and verify the bottom button gets focus via
red color focus rectangle.
If red color focus rectangle is seen at the bottom button,
press Pass else press Fail.
""";
public static void main(String[] args) throws Exception {
// Set Metal L&F
UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
PassFailJFrame.builder()
.title("Test Instructions")
.instructions(INSTRUCTIONS)
.columns(40)
.testUI(MetalFocusBug::createUI)
.build()
.awaitAndCheck();
}
static JFrame createUI() {
// Make focus rectangle very obvious.
UIManager.put("Button.focus", new ColorUIResource(Color.RED));
JFrame frame = new JFrame("MetalFocusBug");
frame.getContentPane().add(new JButton("TOP"), "North");
frame.getContentPane().add(new JButton(""), "Center");
frame.setSize(300, 300);
return frame;
}
}