diff options
author | Felipe Heidrich <fheidric> | 2009-10-05 18:33:03 +0000 |
---|---|---|
committer | Felipe Heidrich <fheidric> | 2009-10-05 18:33:03 +0000 |
commit | be826b9240fb6b63001780ecdc5ffaedc475624b (patch) | |
tree | ff1f275327155997d394cea66e872cee6385e100 | |
parent | 78415155c14b05f3f9c144eccf3987bdaecd11ec (diff) | |
download | eclipse.platform.swt-be826b9240fb6b63001780ecdc5ffaedc475624b.tar.gz eclipse.platform.swt-be826b9240fb6b63001780ecdc5ffaedc475624b.tar.xz eclipse.platform.swt-be826b9240fb6b63001780ecdc5ffaedc475624b.zip |
Bug 142593 - Scrolling a table eventually locks up the entire application
-rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java | 24 |
1 files changed, 12 insertions, 12 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 1f23fbab54..de69bfa489 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 @@ -6307,6 +6307,17 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { } /* + * Feature in Windows. When a new table item is inserted + * using LVM_INSERTITEM in a table that is transparent + * (ie. LVM_SETBKCOLOR has been called with CLR_NONE), + * TVM_INSERTITEM calls LVN_GETDISPINFO before the item + * has been added to the array. The fix is to check for + * null. + */ + TableItem item = _getItem (plvfi.iItem); + if (item == null) break; + + /* * When an item is being deleted from a virtual table, do not * allow the application to provide data for a new item that * becomes visible until the item has been removed from the @@ -6315,23 +6326,12 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) { * in an inconsistent state. Rather than answering the data * right away, queue a redraw for later. */ - if ((style & SWT.VIRTUAL) != 0) { + if ((style & SWT.VIRTUAL) != 0 && !item.cached) { if (ignoreShrink) { OS.SendMessage (handle, OS.LVM_REDRAWITEMS, plvfi.iItem, plvfi.iItem); break; } } - - /* - * Feature in Windows. When a new table item is inserted - * using LVM_INSERTITEM in a table that is transparent - * (ie. LVM_SETBKCOLOR has been called with CLR_NONE), - * TVM_INSERTITEM calls LVN_GETDISPINFO before the item - * has been added to the array. The fix is to check for - * null. - */ - TableItem item = _getItem (plvfi.iItem); - if (item == null) break; /* * The cached flag is used by both virtual and non-virtual |