Bug 126966 can't set text or image asynchronously in virtual table or tree

1 files changed, 31 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
index bcf1ba836c..93716c44ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
@@ -1315,6 +1315,30 @@ public void setImage (int index, Image image) {
 	}
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
 	OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, pixbuf, -1);
+	if (image != null && parent.columnCount == 0) {
+		int /*long*/parentHandle = parent.handle;
+		int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+		if (OS.gtk_tree_view_column_get_sizing (column) == OS.GTK_TREE_VIEW_COLUMN_FIXED) {
+			parent.setScrollWidth (column, this);
+			/*
+			* Bug in GTK.  When in fixed height mode, GTK does not recalculate the cell renderer width
+			* when the image is changed in the model.  The fix is to force it to recalculate the width if
+			* more space is required.
+			*/
+			int [] w = new int [1];
+			int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
+			OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
+			if (w[0] < image.getBounds().width) {
+				/*
+				 * There is no direct way to clear the cell renderer width so we
+				 * are relying on the fact that it is done as part of modifying
+				 * the style.
+				 */
+				int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+				OS.gtk_widget_modify_style (parentHandle, style);
+			} 
+		}
+	}
 	cached = true;
 }
 
@@ -1377,6 +1401,13 @@ public void setText (int index, String string) {
 	byte[] buffer = Converter.wcsToMbcs (null, string, true);
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
 	OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, buffer, -1);
+	if (parent.columnCount == 0) {
+		int /*long*/parentHandle = parent.handle;
+		int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+		if (OS.gtk_tree_view_column_get_sizing (column) == OS.GTK_TREE_VIEW_COLUMN_FIXED) {
+			parent.setScrollWidth (column, this);
+		}
+	}
 	cached = true;
 }