summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
diff options
context:
space:
mode:
authorSilenio Quarti <silenio_quarti@ca.ibm.com>2013-03-21 13:56:07 -0400
committerSilenio Quarti <silenio_quarti@ca.ibm.com>2013-03-21 13:56:07 -0400
commit1b3622f049a05762a91da56f70f9dd5c616b7fe3 (patch)
tree476a7aa4547346b635c58281abd0168b3a7912fc /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
parenta41e15e7547760b92fd60ae3e7e3c9081f82f745 (diff)
downloadeclipse.platform.swt-1b3622f049a05762a91da56f70f9dd5c616b7fe3.tar.gz
eclipse.platform.swt-1b3622f049a05762a91da56f70f9dd5c616b7fe3.tar.xz
eclipse.platform.swt-1b3622f049a05762a91da56f70f9dd5c616b7fe3.zip
Bug 396316 - [GTK3] Table is not given enough height on preferences File Associations page
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java8
1 files changed, 7 insertions, 1 deletions
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 73539b72cd..304bb00f56 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
@@ -1509,8 +1509,14 @@ public int getItemHeight () {
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+ int height = h [0];
+ if (OS.GTK3) {
+ long /*int*/ textRenderer = getTextRenderer (column);
+ OS.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
+ height += h [0];
+ }
ignoreSize = false;
- return h [0];
+ return height;
} else {
int height = 0;
long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());