[6/6] comctl32/listview: Revert column scrolling recent change, it should be handled differently

Nikolay Sivov bunglehead at gmail.com
Mon Jun 8 01:18:57 CDT 2009


Commit 475dcb81f58ed8d479ab3a37a811567d583d7701 caused problems with scrolling.
Not sure how to fix it properly, so reverting. Thinking about removing
column size cashing and use querying from header (like native does on every redraw),
but it should be properly implemented too - simple replace will produce
lot of similar queries.

Changelog:
    - Revert column scrolling recent change, it should be handled differently

>From 7f74f49813ae5c55a6817d610e863e97dd4cc8e5 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Sun, 7 Jun 2009 16:25:06 +0400
Subject: Revert column scrolling recent change, it should be handled differently

---
 dlls/comctl32/listview.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 60e6cc3..4390e4a 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -4675,14 +4675,11 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx)
 	rcCol.left = rcCol.right;
     
     /* adjust the other columns */
-    for (nCol = 0; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++)
+    for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++)
     {
 	lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol);
-	if (lpColumnInfo->rcHeader.left >= rcCol.left)
-	{
-	    lpColumnInfo->rcHeader.left  += dx;
-	    lpColumnInfo->rcHeader.right += dx;
-	}
+	lpColumnInfo->rcHeader.left  += dx;
+	lpColumnInfo->rcHeader.right += dx;
     }
 
     /* do not update screen if not in report mode */
-- 
1.5.6.5





More information about the wine-patches mailing list