From a3f09419e181b26a1a4dbff5e9d1a9eca5c9fa6b Mon Sep 17 00:00:00 2001 From: art Date: Thu, 29 Jan 2009 14:58:12 +0300 Subject: [PATCH] 6721088: Bad window size calculation after using pack() Reviewed-by: anthony Contributed-by: Omair Majid --- .../classes/sun/awt/X11/WindowDimensions.java | 16 +++++ .../classes/sun/awt/X11/XDecoratedPeer.java | 9 ++- .../awt/Frame/FrameSize/TestFrameSize.java | 67 +++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 test/java/awt/Frame/FrameSize/TestFrameSize.java diff --git a/src/solaris/classes/sun/awt/X11/WindowDimensions.java b/src/solaris/classes/sun/awt/X11/WindowDimensions.java index 08511f9e6..70447fee3 100644 --- a/src/solaris/classes/sun/awt/X11/WindowDimensions.java +++ b/src/solaris/classes/sun/awt/X11/WindowDimensions.java @@ -32,10 +32,18 @@ class WindowDimensions { private Insets insets; private boolean isClientSizeSet; + /** + * If isClient is true, the bounds represent the client window area. + * Otherwise, they represent the entire window area, with the insets included + */ public WindowDimensions(int x, int y, int width, int height, boolean isClient) { this(new Rectangle(x, y, width, height), null, isClient); } + /** + * If isClient is true, the bounds represent the client window area. + * Otherwise, they represent the entire window area, with the insets included + */ public WindowDimensions(Rectangle rec, Insets ins, boolean isClient) { if (rec == null) { throw new IllegalArgumentException("Client bounds can't be null"); @@ -46,10 +54,18 @@ class WindowDimensions { setInsets(ins); } + /** + * If isClient is true, the bounds represent the client window area. + * Otherwise, they represent the entire window area, with the insets included + */ public WindowDimensions(Point loc, Dimension size, Insets in, boolean isClient) { this(new Rectangle(loc, size), in, isClient); } + /** + * If isClient is true, the bounds represent the client window area. + * Otherwise, they represent the entire window area, with the insets included + */ public WindowDimensions(Rectangle bounds, boolean isClient) { this(bounds, null, isClient); } diff --git a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java index 5984db224..42ccabee3 100644 --- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java @@ -492,7 +492,14 @@ abstract class XDecoratedPeer extends XWindowPeer { // do nothing but accept it. Rectangle reqBounds = newDimensions.getBounds(); Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height); - newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet()); + Insets insets = newDimensions.getInsets(); + // Inherit isClientSizeSet from newDimensions + if (newDimensions.isClientSizeSet()) { + newBounds = new Rectangle(newBounds.x, newBounds.y, + newBounds.width - insets.left - insets.right, + newBounds.height - insets.top - insets.bottom); + } + newDimensions = new WindowDimensions(newBounds, insets, newDimensions.isClientSizeSet()); } XToolkit.awtLock(); try { diff --git a/test/java/awt/Frame/FrameSize/TestFrameSize.java b/test/java/awt/Frame/FrameSize/TestFrameSize.java new file mode 100644 index 000000000..f8a98ea32 --- /dev/null +++ b/test/java/awt/Frame/FrameSize/TestFrameSize.java @@ -0,0 +1,67 @@ +/* + * Copyright 2009 Red Hat, Inc. 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. + */ + +/* + @test + @bug 6721088 + @summary X11 Window sizes should be what we set them to + @author Omair Majid : area=awt.toplevel + @run main TestFrameSize + */ + +/** + * TestFrameSize.java + * + * Summary: test that X11 Awt windows are drawn with correct sizes + * + * Test fails if size of window is wrong + */ + +import java.awt.Dimension; +import java.awt.Frame; + +public class TestFrameSize { + + static Dimension desiredDimensions = new Dimension(200, 200); + static int ERROR_MARGIN = 15; + static Frame mainWindow; + + public static void drawGui() { + mainWindow = new Frame(""); + mainWindow.setPreferredSize(desiredDimensions); + mainWindow.pack(); + + Dimension actualDimensions = mainWindow.getSize(); + System.out.println("Desired dimensions: " + desiredDimensions.toString()); + System.out.println("Actual dimensions: " + actualDimensions.toString()); + if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) { + throw new RuntimeException("Incorrect widow size"); + } + } + + public static void main(String[] args) { + try { + drawGui(); + } finally { + if (mainWindow != null) { + mainWindow.dispose(); + } + } + } +} -- GitLab