diff options
| author | Carolyn MacLeod | 2010-12-02 19:18:08 +0000 |
|---|---|---|
| committer | Carolyn MacLeod | 2010-12-02 19:18:08 +0000 |
| commit | 655b61d50c03a4c7d58be015595f0114fafdc1f8 (patch) | |
| tree | 9fa013bcb2e7f0a82f1909ebbe6f8938ec2fda73 /bundles/org.eclipse.swt/Eclipse SWT/motif | |
| parent | 338120081ce468594ad0ede2472e9b6e61fbbca9 (diff) | |
| download | eclipse.platform.swt-655b61d50c03a4c7d58be015595f0114fafdc1f8.tar.gz eclipse.platform.swt-655b61d50c03a4c7d58be015595f0114fafdc1f8.tar.xz eclipse.platform.swt-655b61d50c03a4c7d58be015595f0114fafdc1f8.zip | |
Bug 118659 - [Layout] Issues with algorithm in GridLayout.layout and Composite.computeSize
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/motif')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java index d2645790cf..a78c7e4279 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java @@ -157,9 +157,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) { } } else { size = minimumSize (wHint, hHint, changed); + if (size.x == 0) size.x = DEFAULT_WIDTH; + if (size.y == 0) size.y = DEFAULT_HEIGHT; } - if (size.x == 0) size.x = DEFAULT_WIDTH; - if (size.y == 0) size.y = DEFAULT_HEIGHT; if (wHint != SWT.DEFAULT) size.x = wHint; if (hHint != SWT.DEFAULT) size.y = hHint; Rectangle trim = computeTrim (0, 0, size.x, size.y); |