comctl32/toolbar: Avoid unnecessary invalidation on TB_HIDEBUTTON.

85abd4c3 · Aled Hughes · Alexandre Julliard · 86b480b8 · 85abd4c3
Commit 85abd4c3 authored Aug 03, 2009 by Aled Hughes Committed by Alexandre Julliard Aug 03, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

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

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3633,6 +3633,7 @@ static LRESULT
 TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide)
 {
    TBUTTON_INFO *btnPtr;
+    BYTE oldState;
    INT nIndex;

    TRACE("\n");
@@ -3642,15 +3643,17 @@ TOOLBAR_HideButton (TOOLBAR_INFO *infoPtr, INT Id, BOOL fHide)
 	return FALSE;

    btnPtr = &infoPtr->buttons[nIndex];
+    oldState = btnPtr->fsState;

    if (fHide)
 	btnPtr->fsState |= TBSTATE_HIDDEN;
    else
 	btnPtr->fsState &= ~TBSTATE_HIDDEN;

-    TOOLBAR_LayoutToolbar (infoPtr);
-
-    InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
+    if (oldState != btnPtr->fsState) {
+        TOOLBAR_LayoutToolbar (infoPtr);
+        InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
+    }

    return TRUE;
 }