diff options
3 files changed, 5 insertions, 18 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index 4136d14404..ad15358f9f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -48,7 +48,7 @@ public class Table extends Composite { ImageList imageList, headerImageList; TableItem currentItem; TableColumn sortColumn; - boolean ignoreItemHeight, ignoreDraw, ignoreDrawSelection, ignoreDrawBackground; + boolean ignoreDraw, ignoreDrawSelection, ignoreDrawBackground; boolean customDraw, dragStarted, fixScrollWidth, tipRequested, wasSelected, wasResized; boolean ignoreActivate, ignoreSelect, ignoreShrink, ignoreResize, ignoreColumnMove, ignoreColumnResize; int headerToolTipHandle, itemHeight, lastIndexOf, lastWidth, sortDirection, resizeCount, selectionForeground; @@ -2869,10 +2869,7 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, int hDC) { OS.SendMessage (handle, OS.LVM_SETCOLUMNWIDTH, 0, event.x + event.width); } } - if (!ignoreItemHeight) { - if (event.height > getItemHeight ()) setItemHeight (event.height); - ignoreItemHeight = true; - } + if (event.height > getItemHeight ()) setItemHeight (event.height); } return event; } @@ -4063,7 +4060,6 @@ void setTableEmpty () { } } items = new TableItem [4]; - ignoreItemHeight = false; if (columnCount == 0) { OS.SendMessage (handle, OS.LVM_SETCOLUMNWIDTH, 0, 0); setScrollWidth (null, false); diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java index e0a07d6590..5fc484b6a5 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java @@ -492,10 +492,7 @@ LRESULT CDDS_ITEMPOSTPAINT (int wParam, int lParam) { gc.dispose (); OS.RestoreDC (hDC, nSavedDC); if (isDisposed () || item.isDisposed ()) break; - if (!ignoreItemHeight) { - if (event.height > getItemHeight ()) setItemHeight (event.height); - ignoreItemHeight = true; - } + if (event.height > getItemHeight ()) setItemHeight (event.height); } if (hooks (SWT.EraseItem)) { RECT cellRect = item.getBounds (index, true, true, true, true, true, hDC); @@ -867,10 +864,7 @@ LRESULT CDDS_ITEMPREPAINT (int wParam, int lParam) { } } } - if (!ignoreItemHeight) { - if (event.height > getItemHeight ()) setItemHeight (event.height); - ignoreItemHeight = true; - } + if (event.height > getItemHeight ()) setItemHeight (event.height); } selectionForeground = -1; ignoreDraw = ignoreDrawSelection = ignoreDrawBackground = false; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index 78827659ab..319340a168 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -364,10 +364,7 @@ public void pack () { gc.dispose (); OS.RestoreDC (hDC, nSavedDC); if (isDisposed () || parent.isDisposed ()) break; - if (!parent.ignoreItemHeight) { - if (event.height > parent.getItemHeight ()) parent.setItemHeight (event.height); - parent.ignoreItemHeight = true; - } + if (event.height > parent.getItemHeight ()) parent.setItemHeight (event.height); //itemRect.left = event.x; itemRect.right = event.x + event.width; } |