Mercurial > hg > release > icedtea6-1.10
changeset 2271:f6995ca0f34d
Add bug ID to awt_window_size patch to reflect upstreaming.
2010-09-23 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-awt-window-size.patch:
Moved to...
* Makefile.am: Fix path of above patch.
* patches/openjdk/6721088-awt_window_size.patch,
...here to reflect upstreaming.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Fri, 24 Sep 2010 00:14:30 +0100 |
parents | 65ab89d428ac |
children | ebedc637de4d |
files | ChangeLog Makefile.am patches/icedtea-awt-window-size.patch patches/openjdk/6721088-awt_window_size.patch |
diffstat | 4 files changed, 76 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 23 14:40:49 2010 +0100 +++ b/ChangeLog Fri Sep 24 00:14:30 2010 +0100 @@ -1,3 +1,11 @@ +2010-09-23 Andrew John Hughes <ahughes@redhat.com> + + * patches/icedtea-awt-window-size.patch: + Moved to... + * Makefile.am: Fix path of above patch. + * patches/openjdk/6721088-awt_window_size.patch, + ...here to reflect upstreaming. + 2010-09-23 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Thu Sep 23 14:40:49 2010 +0100 +++ b/Makefile.am Fri Sep 24 00:14:30 2010 +0100 @@ -247,7 +247,7 @@ patches/icedtea-sparc-ptracefix.patch \ patches/icedtea-sparc-trapsfix.patch \ patches/icedtea-demo-swingapplet.patch \ - patches/icedtea-awt-window-size.patch \ + patches/openjdk/6721088-awt_window_size.patch \ patches/icedtea-jtreg-6592792.patch \ patches/icedtea-s390-noinline.patch \ patches/icedtea-jtreg-dnd.patch \
--- a/patches/icedtea-awt-window-size.patch Thu Sep 23 14:40:49 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500 -@@ -478,7 +478,10 @@ - // 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(); -+ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right, -+ newBounds.height - insets.top - insets.bottom); -+ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet()); - } - XToolkit.awtLock(); - try { ---- /dev/null 2009-01-09 04:32:08.413012246 -0500 -+++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500 -@@ -0,0 +1,50 @@ -+/* -+ @test -+ @bug 6721088 -+ @summary X11 Window sizes should be what we set them to -+ @author Omair Majid <omajid@redhat.com> -+ @run main TestFrameSize -+ */ -+ -+import java.awt.Dimension; -+import java.awt.Frame; -+ -+/** -+ * TestFrameSize.java -+ * -+ * Summary: test that X11 Awt windows are drawn with correct sizes -+ * -+ * Test fails if size of window is wrong -+ */ -+ -+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(); -+ // mainWindow.setVisible(true); -+ -+ Dimension actualDimensions = mainWindow.getSize(); -+ // System.out.println(desiredDimensions); -+ // System.out.println(actualDimensions); -+ 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(); -+ } -+ } -+ } -+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6721088-awt_window_size.patch Fri Sep 24 00:14:30 2010 +0100 @@ -0,0 +1,67 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500 +@@ -478,7 +478,10 @@ + // 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(); ++ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right, ++ newBounds.height - insets.top - insets.bottom); ++ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet()); + } + XToolkit.awtLock(); + try { +--- /dev/null 2009-01-09 04:32:08.413012246 -0500 ++++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500 +@@ -0,0 +1,50 @@ ++/* ++ @test ++ @bug 6721088 ++ @summary X11 Window sizes should be what we set them to ++ @author Omair Majid <omajid@redhat.com> ++ @run main TestFrameSize ++ */ ++ ++import java.awt.Dimension; ++import java.awt.Frame; ++ ++/** ++ * TestFrameSize.java ++ * ++ * Summary: test that X11 Awt windows are drawn with correct sizes ++ * ++ * Test fails if size of window is wrong ++ */ ++ ++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(); ++ // mainWindow.setVisible(true); ++ ++ Dimension actualDimensions = mainWindow.getSize(); ++ // System.out.println(desiredDimensions); ++ // System.out.println(actualDimensions); ++ 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(); ++ } ++ } ++ } ++}