Reduce toolbar redrawing and flicker by calling RedrawWindow() in

TOOLBAR_MouseMove() only if hot effect applies to the current hot button. Restore bHot flag of hot button in TOOLBAR_LButtonUp() to restore hot effect properly.

Reduce toolbar redrawing and flicker by calling RedrawWindow() in
7030c5f7 · Chris Morgan · Alexandre Julliard · 7f90a8c9 · 7030c5f7
Commit 7030c5f7 authored May 23, 2000 by Chris Morgan Committed by Alexandre Julliard May 23, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

toolbar.c dlls/comctl32/toolbar.c +11 -3

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3159,6 +3159,10 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
    pt.y = (INT)HIWORD(lParam);
    nHit = TOOLBAR_InternalHitTest (hwnd, &pt);

+    /* restore hot effect to hot button disabled by TOOLBAR_LButtonDown() */
+    if(infoPtr->nHotItem >= 0)
+        infoPtr->buttons[infoPtr->nHotItem].bHot = TRUE;
+
    if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0)) {
 	infoPtr->bCaptured = FALSE;
 	ReleaseCapture ();
@@ -3317,10 +3321,14 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	    btnPtr = &infoPtr->buttons[nHit];
 	    btnPtr->bHot = TRUE;

-            RedrawWindow(hwnd,&btnPtr->rect,NULL,
-                         RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
-
 	    infoPtr->nHotItem = nHit;
+
+            /* only enabled buttons show hot effect */            
+            if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED)
+            {
+                RedrawWindow(hwnd,&btnPtr->rect,NULL,
+                         RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
+            }
 	}

    if (infoPtr->bCaptured) {