|
Lines 20-26
Link Here
|
| 20 |
import org.eclipse.swt.graphics.TextLayout; |
20 |
import org.eclipse.swt.graphics.TextLayout; |
| 21 |
import org.eclipse.swt.widgets.Display; |
21 |
import org.eclipse.swt.widgets.Display; |
| 22 |
import org.eclipse.swt.widgets.Event; |
22 |
import org.eclipse.swt.widgets.Event; |
| 23 |
import org.eclipse.swt.widgets.Widget; |
|
|
| 24 |
|
23 |
|
| 25 |
import org.eclipse.core.runtime.Assert; |
24 |
import org.eclipse.core.runtime.Assert; |
| 26 |
|
25 |
|
|
Lines 74-80
Link Here
|
| 74 |
private ColumnViewer viewer; |
73 |
private ColumnViewer viewer; |
| 75 |
private ViewerColumn column; |
74 |
private ViewerColumn column; |
| 76 |
|
75 |
|
| 77 |
private Widget itemOfLastMeasure; |
|
|
| 78 |
private int deltaOfLastMeasure; |
76 |
private int deltaOfLastMeasure; |
| 79 |
|
77 |
|
| 80 |
/** |
78 |
/** |
|
Lines 280-288
Link Here
|
| 280 |
TextLayout layout = getSharedTextLayout(event.display); |
278 |
TextLayout layout = getSharedTextLayout(event.display); |
| 281 |
|
279 |
|
| 282 |
int textWidthDelta = deltaOfLastMeasure = updateTextLayout(layout, cell, applyColors); |
280 |
int textWidthDelta = deltaOfLastMeasure = updateTextLayout(layout, cell, applyColors); |
| 283 |
/* remove-begin if bug 228695 fixed */ |
|
|
| 284 |
itemOfLastMeasure = event.item; |
| 285 |
/* remove-end if bug 228695 fixed */ |
| 286 |
|
281 |
|
| 287 |
event.width += textWidthDelta; |
282 |
event.width += textWidthDelta; |
| 288 |
} |
283 |
} |
|
Lines 369-381
Link Here
|
| 369 |
if (textBounds != null) { |
364 |
if (textBounds != null) { |
| 370 |
TextLayout textLayout= getSharedTextLayout(event.display); |
365 |
TextLayout textLayout= getSharedTextLayout(event.display); |
| 371 |
|
366 |
|
| 372 |
/* remove-begin if bug 228695 fixed */ |
367 |
deltaOfLastMeasure = updateTextLayout(textLayout, cell, applyColors); |
| 373 |
if (event.item != itemOfLastMeasure) { |
|
|
| 374 |
// fLayout has not been configured in 'measure()' |
| 375 |
deltaOfLastMeasure = updateTextLayout(textLayout, cell, applyColors); |
| 376 |
itemOfLastMeasure = event.item; |
| 377 |
} |
| 378 |
/* remove-end if bug 228695 fixed */ |
| 379 |
|
368 |
|
| 380 |
/* remove-begin if bug 228376 fixed */ |
369 |
/* remove-begin if bug 228376 fixed */ |
| 381 |
if (!applyColors) { |
370 |
if (!applyColors) { |
