[ros-diffs] [weiden] 13351: When a toolbar doesn't have the TBSTYLE_FLAT style redrawing the buttons when moving the mouse is not necessary.

[weiden at svn.reactos.com]

When a toolbar doesn't have the TBSTYLE_FLAT style redrawing the buttons
when moving the mouse is not necessary.
Merged back from winehq. Fixes bug #404
Modified: trunk/reactos/lib/comctl32/toolbar.c
  _____  

Modified: trunk/reactos/lib/comctl32/toolbar.c
--- trunk/reactos/lib/comctl32/toolbar.c	2005-01-28 13:28:56 UTC
(rev 13350)
+++ trunk/reactos/lib/comctl32/toolbar.c	2005-01-28 18:29:13 UTC
(rev 13351)
@@ -6081,23 +6081,25 @@

     INT   nHit;
     TBUTTON_INFO *btnPtr;
 
-    /* fill in the TRACKMOUSEEVENT struct */
-    trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
-    trackinfo.dwFlags = TME_QUERY;
-    trackinfo.hwndTrack = hwnd;
-    trackinfo.dwHoverTime = HOVER_DEFAULT;
+    if (infoPtr->dwStyle & TBSTYLE_FLAT) {
+        /* fill in the TRACKMOUSEEVENT struct */
+        trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
+        trackinfo.dwFlags = TME_QUERY;
+        trackinfo.hwndTrack = hwnd;
+        trackinfo.dwHoverTime = HOVER_DEFAULT;
 
-    /* call _TrackMouseEvent to see if we are currently tracking for
this hwnd */
-    _TrackMouseEvent(&trackinfo);
+        /* call _TrackMouseEvent to see if we are currently tracking
for this hwnd */
+        _TrackMouseEvent(&trackinfo);
 
-    /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE
message */
-    if(!(trackinfo.dwFlags & TME_LEAVE)) {
-        trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
+        /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE
message */
+        if(!(trackinfo.dwFlags & TME_LEAVE)) {
+            trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
 
-        /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message
*/
-        /* and can properly deactivate the hot toolbar button */
-        _TrackMouseEvent(&trackinfo);
-   }
+            /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE
message */
+            /* and can properly deactivate the hot toolbar button */
+            _TrackMouseEvent(&trackinfo);
+       }
+    }
 
     if (infoPtr->hwndToolTip)
 	TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
@@ -6108,7 +6110,7 @@
 
     nHit = TOOLBAR_InternalHitTest (hwnd, &pt);
 
-    if (!infoPtr->bAnchor || (nHit >= 0))
+    if ((infoPtr->dwStyle & TBSTYLE_FLAT) && (!infoPtr->bAnchor ||
(nHit >= 0)))
         TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE);
 
     if (infoPtr->nOldHit != nHit)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050128/f662df24/attachment.html