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

6721088: Bad window size calculation after using pack()

Browse Source 
Reviewed-by: anthony
This commit is contained in:
Omair Majid 2009-01-29 14:58:12 +03:00 committed by Artem Ananiev
parent 3247a31478
commit 9ea7492522
3 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/solaris/classes/sun/awt/X11/WindowDimensions.java
View File

@ -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);
}

9
jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
View File

@ -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 {

67
jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java Normal file
View File

@ -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 <omajid@redhat.com>: 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();
}
}
}
}