Attachment 119979 Details for Bug 258196 – Patch with suggested fix.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch with suggested fix.

20081209_gtkTree.patch (text/plain), 2.22 KB, created by Pawel Piech

on 2008-12-09 17:12:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2008-12-09 17:12:35 EST

Size: 2.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java,v
>retrieving revision 1.96
>diff -u -r1.96 TreeItem.java
>--- Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java	5 Jun 2008 17:31:09 -0000	1.96
>+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java	9 Dec 2008 21:48:58 -0000
>@@ -37,7 +37,7 @@
> 	Tree parent;
> 	Font font;
> 	Font[] cellFont;
>-	boolean cached, grayed;
>+	boolean cached, grayed, updated;
> 	static final int EXPANDER_EXTRA_PADDING = 4;
> 
> /**
>@@ -1351,6 +1351,7 @@
> 		}
> 	}
> 	cached = true;
>+    updated = true;
> }
> 
> /**
>@@ -1402,6 +1403,7 @@
> 		}
> 	}
> 	cached = true;
>+    updated = true;
> 	
> 	if (font != null) {
> 		boolean customDraw = (parent.columnCount == 0)  ? parent.firstCustomDraw : parent.columns [index].customDraw;
>@@ -1638,6 +1640,7 @@
> 		}
> 	}
> 	cached = true;
>+	updated = true;
> }
> 
> public void setImage (Image image) {
>@@ -1723,6 +1726,7 @@
> 		}
> 	}
> 	cached = true;
>+	updated = true;
> }
> 
> public void setText (String string) {
>Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java,v
>retrieving revision 1.260
>diff -u -r1.260 Tree.java
>--- Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java	22 Jul 2008 18:19:23 -0000	1.260
>+++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java	9 Dec 2008 21:48:57 -0000
>@@ -238,6 +238,7 @@
> 	}
> 	if (modelIndex == -1) return 0;
> 	boolean setData = false;
>+	boolean updated = false;
> 	if ((style & SWT.VIRTUAL) != 0) {
> 		/*
> 		* Feature in GTK.  On GTK before 2.4, fixed_height_mode is not
>@@ -266,6 +267,10 @@
> 			//lastIndexOf = index [0];
> 			setData = checkData (item);
> 		}
>+        if (item.updated) {
>+            item.updated = false;
>+            updated = true;
>+        }
> 	}
> 	int /*long*/ [] ptr = new int /*long*/ [1];
> 	if (setData) {
>@@ -309,7 +314,7 @@
> 			}
> 		}
> 	}
>-	if (setData) {
>+	if (setData || updated) {
> 		ignoreCell = cell;
> 		setScrollWidth (tree_column, item);
> 		ignoreCell = 0;

Actions: View | Diff

Attachments on bug 258196: 119978 | 119979