comctl32: toolbar[7/8]: use the width of the current button instead of nButtonWidth to position the icon (fixes bug #3459) (resend)

[Mikołaj Zalewski]

-------------- next part --------------
From 58889248ded273295fddf46dbdd80ec2251aaf69 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Miko=C5=82aj_Zalewski?= <mikolaj at zalewski.pl>
Date: Wed, 1 Nov 2006 22:05:54 +0100
Subject: [PATCH] comctl32: toolbar: use the width of the current button instead of nButtonWidth to position the icon (fixes bug #3459)

---
 dlls/comctl32/toolbar.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 42ec39e..8875ca0 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -896,7 +896,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I
             rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + infoPtr->iListGap / 2;
     }
     else
-        rcBitmap.left += (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
+        rcBitmap.left += ((rc.right - rc.left) - infoPtr->nBitmapWidth) / 2;
 
     rcBitmap.top += infoPtr->szPadding.cy / 2;
 
-- 
1.4.2.3