From 03a2724000604bf42d0943fa9eb081a3d72f7331 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Fri, 8 Sep 2006 22:30:46 +0000 Subject: [PATCH] User32 static.c: - Patch by Dmitry Timoshkov, modified for ReactOS. - Use computed icon rectangle if SS_CENTERIMAGE style is set. svn path=/trunk/; revision=23981 --- reactos/dll/win32/user32/controls/static.c | 10 ++++------ reactos/media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/user32/controls/static.c b/reactos/dll/win32/user32/controls/static.c index 8957ca7ed76..e2bc81a04d1 100644 --- a/reactos/dll/win32/user32/controls/static.c +++ b/reactos/dll/win32/user32/controls/static.c @@ -746,14 +746,12 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) iconRect.top = (rc.bottom - rc.top) / 2 - bm.bmHeight / 2; iconRect.right = iconRect.left + bm.bmWidth; iconRect.bottom = iconRect.top + bm.bmHeight; - FillRect( hdc, &iconRect, hbrush ); /* Wine source has &rc */ } else - { - FillRect( hdc, &rc, hbrush ); - DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left, - rc.bottom - rc.top, 0, NULL, DI_NORMAL ); - } + iconRect = rc; + FillRect( hdc, &rc, hbrush ); + DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, + iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); } } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 014a8f01173..e53ab86563f 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -124,7 +124,7 @@ User32 - reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 reactos/dll/win32/user32/controls/scrollbar.c # Forked - reactos/dll/win32/user32/controls/static.c # Synced at 20060622 + reactos/dll/win32/user32/controls/static.c # Synced at 20060908 reactos/dll/win32/user32/misc/dde.c # Synced at 20060623 (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Synced at 20060623