Bug 534692 - Scrollbar area in compare editor too small
The fix for bug 533799 causes a regression, which manifests as a
too-short vertical scroll bar in the Compare Editor.
The regression is caused by changing the implementation of
Scrollable.hScrollBarWidth() to return the width instead of the height
of the computed GTK preferred size requisition. This was due to an
oversight during refactoring.
This change restores the original API functionality, in return fixing
the layout of the compare editor.
Change-Id: I776df3efd8811b8a5fd2360691396d72cc3a6a3f
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
index d39b5b9..edbadcb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
@@ -364,11 +364,6 @@
int hScrollBarWidth() {
Point hScrollbarSize = hScrollbarSize();
- return hScrollbarSize.x;
-}
-
-int hScrollBarHeight() {
- Point hScrollbarSize = hScrollbarSize();
return hScrollbarSize.y;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index f081035..bc65f91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -4211,7 +4211,7 @@
* and the horizontal scrollbar is only partially visible so that it doesn't overlap with table headers.
*/
if (widget == scrolledHandle && GTK.GTK_VERSION >= OS.VERSION(3, 14, 0) && getHeaderVisible()) {
- int hScrollBarHeight = hScrollBarHeight();
+ int hScrollBarHeight = hScrollBarWidth(); // this actually returns height
if (hScrollBarHeight > 0) {
sizes.y = Math.max(sizes.y, getHeaderHeight() + hScrollBarHeight + (getBorderWidth() * 2));
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 7b0c6d4..33cc37b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -4128,7 +4128,7 @@
* and the horizontal scrollbar is only partially visible so that it doesn't overlap with tree headers.
*/
if (widget == scrolledHandle && GTK.GTK_VERSION >= OS.VERSION(3, 14, 0) && getHeaderVisible()) {
- int hScrollBarHeight = hScrollBarHeight();
+ int hScrollBarHeight = hScrollBarWidth(); // this actually returns height
if (hScrollBarHeight > 0) {
sizes.y = Math.max(sizes.y, getHeaderHeight() + hScrollBarHeight + (getBorderWidth() * 2));
}
