diff options
| author | Eric Williams | 2016-02-25 19:32:55 +0000 |
|---|---|---|
| committer | Eric Williams | 2016-02-25 19:32:55 +0000 |
| commit | 8a370a563c18a63d7de19922c28261623b74f8b3 (patch) | |
| tree | 23653ea9fc66d8add6b3f34eaa8c8d55dcfe27fc | |
| parent | 4f73bb5f5e4e14e1dc578b1f6ffb0befc8181102 (diff) | |
| download | eclipse.platform.swt-8a370a563c18a63d7de19922c28261623b74f8b3.tar.gz eclipse.platform.swt-8a370a563c18a63d7de19922c28261623b74f8b3.tar.xz eclipse.platform.swt-8a370a563c18a63d7de19922c28261623b74f8b3.zip | |
Revert "Bug 487522: [GTK3.20] Entries/Text widgets have smaller heights"
This reverts commit 4f73bb5f5e4e14e1dc578b1f6ffb0befc8181102.
Change-Id: I7255df917d44a995f196843489a61a40c17db675
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index f67ed6f3fd..3e8ed4a87e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -600,12 +600,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) { trim.x -= tmp.left; trim.y -= tmp.top; trim.width += tmp.left + tmp.right; - if (OS.GTK_VERSION >= OS.VERSION (3, 19, 0)) { - Point widthNative = computeNativeSize(handle, trim.width, SWT.DEFAULT, true); - trim.height = widthNative.y; - } else { - trim.height = tmp.bottom + tmp.top; - } + trim.height += tmp.top + tmp.bottom; if ((style & SWT.BORDER) != 0) { OS.gtk_style_context_get_border (context, styleState, tmp); trim.x -= tmp.left; |