Attachment 126169 Details for Bug 257919 – Patch to remove bug 228965's hacks.

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

[patch] Patch to remove bug 228965's hacks.

bug257919-patch-v1.txt (text/plain), 1.78 KB, created by Remy Suen

on 2009-02-19 10:04:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2009-02-19 10:04:35 EST

Size: 1.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/viewers/StyledCellLabelProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledCellLabelProvider.java,v
>retrieving revision 1.7
>diff -u -r1.7 StyledCellLabelProvider.java
>--- src/org/eclipse/jface/viewers/StyledCellLabelProvider.java	13 Feb 2009 07:38:30 -0000	1.7
>+++ src/org/eclipse/jface/viewers/StyledCellLabelProvider.java	19 Feb 2009 14:55:20 -0000
>@@ -20,7 +20,6 @@
> import org.eclipse.swt.graphics.TextLayout;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Event;
>-import org.eclipse.swt.widgets.Widget;
> 
> import org.eclipse.core.runtime.Assert;
> 
>@@ -74,7 +73,6 @@
> 	private ColumnViewer viewer;
> 	private ViewerColumn column;
> 	
>-	private Widget itemOfLastMeasure;
> 	private int deltaOfLastMeasure;
> 
> 	/**
>@@ -280,9 +278,6 @@
> 		TextLayout layout = getSharedTextLayout(event.display);
> 		
> 		int textWidthDelta = deltaOfLastMeasure = updateTextLayout(layout, cell, applyColors);
>-		/* remove-begin if bug 228695 fixed */
>-		itemOfLastMeasure = event.item;
>-		/* remove-end if bug 228695 fixed */
> 
> 		event.width += textWidthDelta;
> 	}
>@@ -369,13 +364,7 @@
> 		if (textBounds != null) {
> 			TextLayout textLayout= getSharedTextLayout(event.display);
> 
>-			/* remove-begin if bug 228695 fixed */
>-			if (event.item != itemOfLastMeasure) {
>-				// fLayout has not been configured in 'measure()'
>-				deltaOfLastMeasure = updateTextLayout(textLayout, cell, applyColors);
>-				itemOfLastMeasure = event.item;
>-			}
>-			/* remove-end if bug 228695 fixed */
>+			deltaOfLastMeasure = updateTextLayout(textLayout, cell, applyColors);
> 			
> 			/* remove-begin if bug 228376 fixed */
> 			if (!applyColors) {

Actions: View | Diff

Attachments on bug 257919: 119780 | 120568 | 126109 | 126169 | 128286