diff options
author | Felipe Heidrich <fheidric> | 2010-12-22 15:59:54 +0000 |
---|---|---|
committer | Felipe Heidrich <fheidric> | 2010-12-22 15:59:54 +0000 |
commit | 328e0a713f76a434a808783aa22de3b79d8c2f9f (patch) | |
tree | 1fe740860dc2af98d85cbef8c4d6b9feaca6273f /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java | |
parent | 45c9259f4bbd4b6754fbc6b535504db3c8611676 (diff) | |
download | eclipse.platform.swt-328e0a713f76a434a808783aa22de3b79d8c2f9f.tar.gz eclipse.platform.swt-328e0a713f76a434a808783aa22de3b79d8c2f9f.tar.xz eclipse.platform.swt-328e0a713f76a434a808783aa22de3b79d8c2f9f.zip |
Bug 333002 - Composite#minimumSize ignores clientArea origin
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java index 07a409538e..c970968980 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java @@ -1226,11 +1226,12 @@ void moveChildren(int oldWidth) { Point minimumSize (int wHint, int hHint, boolean changed) { Control [] children = _getChildren (); + Rectangle clientArea = getClientArea (); int width = 0, height = 0; for (int i=0; i<children.length; i++) { Rectangle rect = children [i].getBounds (); - width = Math.max (width, rect.x + rect.width); - height = Math.max (height, rect.y + rect.height); + width = Math.max (width, rect.x - clientArea.x + rect.width); + height = Math.max (height, rect.y - clientArea.y + rect.height); } return new Point (width, height); } |