8058785: Nimbus disabled tooltip needs border
Reviewed-by: serb, pkbalakr
Contributed-by: shashidhara.veerabhadraiah@oracle.com
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf Wed Aug 02 11:26:57 2017 +0530
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf Thu Aug 03 14:55:48 2017 +0530
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1998, 2017, 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
@@ -27303,6 +27303,45 @@
</layer>
</canvas>
</state>
+ <state stateKeys="Disabled">
+ <style>
+ <textForeground/>
+ <textBackground/>
+ <background/>
+ <uiproperties/>
+ </style>
+ <canvas>
+ <size width="10" height="10"/>
+ <nextLayerNameIndex>3</nextLayerNameIndex>
+ <stretchingInsets top="1" bottom="1" left="1" right="1"/>
+ <layer name="Layer 1">
+ <opacity>1.0</opacity>
+ <fillOpacity>1.0</fillOpacity>
+ <blendingMode>NORMAL</blendingMode>
+ <locked>false</locked>
+ <visible>true</visible>
+ <shapes>
+ <rectangle x1="0.0" x2="10.0" y1="0.0" y2="1.0" rounding="0.0">
+ <matte red="116" green="121" blue="128" alpha="255" uiDefaultParentName="nimbusBorder" hueOffset="-0.013888836" saturationOffset="5.823001E-4" brightnessOffset="-0.12941176" alphaOffset="0"/>
+ <paintPoints x1="0.25" y1="0.0" x2="0.75" y2="1.0"/>
+ </rectangle>
+ <rectangle x1="0.0" x2="10.0" y1="9.0" y2="10.0" rounding="0.0">
+ <matte red="116" green="121" blue="128" alpha="255" uiDefaultParentName="nimbusBorder" hueOffset="-0.013888836" saturationOffset="5.823001E-4" brightnessOffset="-0.12941176" alphaOffset="0"/>
+ <paintPoints x1="0.25" y1="0.0" x2="0.75" y2="1.0"/>
+ </rectangle>
+ <rectangle x1="0.0" x2="1.0" y1="1.0" y2="9.0" rounding="0.0">
+ <matte red="116" green="121" blue="128" alpha="255" uiDefaultParentName="nimbusBorder" hueOffset="-0.013888836" saturationOffset="5.823001E-4" brightnessOffset="-0.12941176" alphaOffset="0"/>
+ <paintPoints x1="0.25" y1="0.0" x2="0.75" y2="1.0"/>
+ </rectangle>
+ <rectangle x1="9.0" x2="10.0" y1="1.0" y2="9.0" rounding="0.0">
+ <matte red="116" green="121" blue="128" alpha="255" uiDefaultParentName="nimbusBorder" hueOffset="-0.013888836" saturationOffset="5.823001E-4" brightnessOffset="-0.12941176" alphaOffset="0"/>
+ <paintPoints x1="0.25" y1="0.0" x2="0.75" y2="1.0"/>
+ </rectangle>
+ </shapes>
+ <effects/>
+ </layer>
+ </canvas>
+ </state>
</backgroundStates>
<foregroundStates/>
<borderStates/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/plaf/nimbus/TestDisabledToolTipBorder.java Thu Aug 03 14:55:48 2017 +0530
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2017, 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 8058785
+ * @summary Displaying border around the disabled component's tool tip text
+ * @run main/manual TestDisabledToolTipBorder
+ */
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import java.awt.Insets;
+
+public class TestDisabledToolTipBorder {
+ private static TestUI test;
+ public static void main(String args[]) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ test = new TestUI(latch);
+ SwingUtilities.invokeAndWait(() -> {
+ try {
+ test.createUI();
+ } catch (Exception ex) {
+ throw new RuntimeException("Exception while creating UI");
+ }
+ });
+
+ boolean status = latch.await(2, TimeUnit.MINUTES);
+ if (!status) {
+ System.out.println("Test timed out.");
+ }
+
+ if (test.testResult == false) {
+ disposeUI();
+ throw new RuntimeException("Test Failed.");
+ }
+ }
+
+ public static void disposeUI() throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ try {
+ if(test != null) {
+ test.disposeUI();
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Exception while disposing UI");
+ }
+ });
+ }
+}
+
+class TestUI {
+
+ private static JFrame mainFrame;
+ private static JPanel mainControlPanel;
+
+ private static JTextArea instructionTextArea;
+
+ private static JPanel resultButtonPanel;
+ private static JButton passButton;
+ private static JButton failButton;
+
+ private GridBagConstraints gbc;
+ private static GridBagLayout layout;
+ private final CountDownLatch latch;
+ public boolean testResult = false;
+
+ public final void initialize() throws Exception {
+ // Apply nimbus look and feel
+ UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
+ }
+
+ public TestUI(CountDownLatch latch) throws Exception {
+ this.latch = latch;
+
+ // initialize the UI
+ initialize();
+ }
+
+ public final void createUI() throws Exception {
+ mainFrame = new JFrame();
+
+ layout = new GridBagLayout();
+ mainControlPanel = new JPanel(layout);
+ resultButtonPanel = new JPanel(layout);
+
+ gbc = new GridBagConstraints();
+ // Create Test instructions
+ String instructions
+ = "Move cursor over disabled button.\n"
+ + "Check if there is a border around the tooltip text \n"
+ + "If yes, click on 'pass' else click on 'fail'\n";
+
+ instructionTextArea = new JTextArea();
+ instructionTextArea.setText(instructions);
+ instructionTextArea.setEditable(false);
+ instructionTextArea.setBorder(BorderFactory.
+ createTitledBorder("Test Instructions"));
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ mainControlPanel.add(instructionTextArea, gbc);
+
+ // Add customization to this test ui
+ customize();
+
+ // Create resultButtonPanel with Pass, Fail buttons
+ passButton = new JButton("Pass");
+ passButton.setActionCommand("Pass");
+ passButton.addActionListener((ActionEvent e) -> {
+ System.out.println("Pass Button pressed!");
+ testResult = true;
+ latch.countDown();
+ disposeUI();
+ });
+
+ failButton = new JButton("Fail");
+ failButton.setActionCommand("Fail");
+ failButton.addActionListener((ActionEvent e) -> {
+ System.out.println("Fail Button pressed!");
+ testResult = false;
+ latch.countDown();
+ disposeUI();
+ });
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ resultButtonPanel.add(passButton, gbc);
+
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ resultButtonPanel.add(failButton, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ mainControlPanel.add(resultButtonPanel, gbc);
+
+ mainFrame.add(mainControlPanel);
+ mainFrame.pack();
+ mainFrame.setVisible(true);
+ }
+
+ public void disposeUI() {
+ mainFrame.dispose();
+ }
+
+ private void customize() throws Exception {
+ // Add custom panel for the main control panel
+ JPanel customButtonPanel = new JPanel(layout);
+
+ // Customize the test UI title
+ mainFrame.setTitle("TestDisabledToolTipBorder");
+
+ // Adding the disabled button along with tool tip text
+ JButton disabledButton = new JButton("Disabled Button");
+ disabledButton.setToolTipText("TooltipText");
+ disabledButton.setMargin(new Insets(30, 30, 30, 30));
+ disabledButton.setEnabled(false);
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ customButtonPanel.add(disabledButton, gbc);
+
+ gbc.gridx = 0;
+ gbc.gridy = 1;
+ mainControlPanel.add(customButtonPanel, gbc);
+ }
+}