aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Hake2013-12-04 11:51:20 (EST)
committerThorsten Hake2013-12-04 11:51:20 (EST)
commit08488af4a08131094290f0866f4e94f3e80dabd3 (patch)
treeb90c268e95e1fcf357e8e3094acccada49abddcc
parent2d82355b9d510cfa457741d21f260bd0e064bf17 (diff)
downloadorg.eclipse.nebula-08488af4a08131094290f0866f4e94f3e80dabd3.zip
org.eclipse.nebula-08488af4a08131094290f0866f4e94f3e80dabd3.tar.gz
org.eclipse.nebula-08488af4a08131094290f0866f4e94f3e80dabd3.tar.bz2
Bug 415868 - Fixed computeSize of TableComborefs/changes/09/19309/2
ComputeSize took the table into account when calculating its width, this is not correct. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=415868 Change-Id: I03bbd96e2cf7b4041592e24e4d9df7529e35f812 Signed-off-by: Thorsten Hake <eclipse@thorsten-hake.com>
-rw-r--r--widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
index 3851e17..baef43d 100644
--- a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
+++ b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
@@ -12,6 +12,7 @@
* Wolfgang Schramm <wschramm@ch.ibm.com> - added vertical alignment of text for selected table item.
* Enrico Schnepel <enrico.schnepel@randomice.net> - help event listener bug 326285
* Andreas Ehret <> - patch for bug 334786
+ * Thorsten Hake <mail@thorsten-hake.com> - fix for bug 415868
*****************************************************************************/
package org.eclipse.nebula.widgets.tablecombo;
@@ -520,11 +521,10 @@ public class TableCombo extends Composite {
gc.dispose ();
Point textSize = text.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
Point arrowSize = arrow.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
- Point tableSize = table.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
overallHeight = Math.max (textSize.y, arrowSize.y);
overallHeight = Math.max (maxImageHeight, overallHeight);
- overallWidth = Math.max (maxTextWidth + 2*spacer + arrowSize.x + 2*borderWidth, tableSize.x);
+ overallWidth = maxTextWidth + 2*spacer + arrowSize.x + 2*borderWidth;
// use user specified if they were entered.
if (wHint != SWT.DEFAULT) overallWidth = wHint;