stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4916923: In MetalRootPaneUI, MetalRootLayout does not correctly calculate minimumsize

Browse Source 
Reviewed-by: shade
This commit is contained in:
Sergey Bylokhov 2020-11-19 22:39:37 +00:00
parent fae68ff016
commit c816464c1d
2 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, 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
@ -25,13 +25,31 @@
package javax.swing.plaf.metal;
import java.awt.event.*;
import java.awt.Component;
import java.awt.Container;
import java.awt.Cursor;
import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.Frame;
import java.awt.Insets;
import java.awt.LayoutManager;
import java.awt.LayoutManager2;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.swing.plaf.basic.*;
import java.awt.*;
import javax.swing.JComponent;
import javax.swing.JLayeredPane;
import javax.swing.JRootPane;
import javax.swing.LookAndFeel;
import javax.swing.SwingUtilities;
import javax.swing.event.MouseInputListener;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicRootPaneUI;
/**
* Provides the metal look and feel implementation of <code>RootPaneUI</code>.
@ -485,7 +503,7 @@ public class MetalRootPaneUI extends BasicRootPaneUI
}
return new Dimension(Math.max(Math.max(cpWidth, mbWidth), tpWidth) + i.left + i.right,
cpHeight + mbHeight + tpWidth + i.top + i.bottom);
cpHeight + mbHeight + tpHeight + i.top + i.bottom);
}
/**
@ -536,7 +554,7 @@ public class MetalRootPaneUI extends BasicRootPaneUI
}
return new Dimension(Math.max(Math.max(cpWidth, mbWidth), tpWidth) + i.left + i.right,
cpHeight + mbHeight + tpWidth + i.top + i.bottom);
cpHeight + mbHeight + tpHeight + i.top + i.bottom);
}
/**

99
test/jdk/javax/swing/JRootPane/RootPaneDecorationSize.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2020, 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.Component;
import java.awt.Dimension;
import java.awt.EventQueue;
import javax.swing.JFrame;
import javax.swing.JLayeredPane;
import javax.swing.JRootPane;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import static javax.swing.UIManager.getInstalledLookAndFeels;
/**
* @test
* @bug 4916923
* @key headful
* @summary MetalRootLayout does not correctly calculate minimumsize
*/
public final class RootPaneDecorationSize {
public static void main(String[] args) throws Exception {
for (UIManager.LookAndFeelInfo laf : getInstalledLookAndFeels()) {
EventQueue.invokeAndWait(() -> setLookAndFeel(laf));
EventQueue.invokeAndWait(RootPaneDecorationSize::test);
}
}
private static void test() {
JFrame frame = new JFrame();
Dimension size;
Dimension min;
Dimension pref;
try {
// undecorated frame and decorated root pane usually used together
frame.setUndecorated(true);
frame.getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
// customize the current L&F (mimic custom L&F)
JLayeredPane layeredPane = frame.getRootPane().getLayeredPane();
for (Component comp : layeredPane.getComponents()) {
comp.setMinimumSize(new Dimension(1000, 10));
comp.setMaximumSize(new Dimension(1000, 10));
comp.setPreferredSize(new Dimension(1000, 10));
}
frame.pack();
size = frame.getSize();
min = frame.getMinimumSize();
pref = frame.getPreferredSize();
} finally {
frame.dispose();
}
System.err.println("\tsize = " + size);
System.err.println("\tminimumSize = " + min);
System.err.println("\tpreferredSize = " + pref);
// We cannot predict which size will be used by the current L&F
// but based on customization above the height < 1000 and width > 1000
if (size.height > 1000 || min.height > 1000 || pref.height > 1000) {
throw new RuntimeException("The height too big");
}
if (size.width < 1000 || min.width < 1000 || pref.width < 1000) {
throw new RuntimeException("The width too small");
}
}
private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
try {
System.err.println("LookAndFeel: " + laf.getClassName());
UIManager.setLookAndFeel(laf.getClassName());
} catch (UnsupportedLookAndFeelException ignored){
System.err.println("Unsupported LookAndFeel: " + laf.getClassName());
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e) {
throw new RuntimeException(e);
}
}
}