wine/dlls/user static.c

[Alexandre Julliard]

ChangeSet ID:	21333
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/18 09:04:25

Modified files:
	dlls/user      : static.c 

Log message:
	Kieran Clancy <n0dalus+wine at gmail.com>
	Fix vertical text alignment in static controls.

Patch: http://cvs.winehq.org/patch.py?id=21333

Old revision  New revision  Changes     Path
 1.9           1.10          +4 -4       wine/dlls/user/static.c

Index: wine/dlls/user/static.c
diff -u -p wine/dlls/user/static.c:1.9 wine/dlls/user/static.c:1.10
--- wine/dlls/user/static.c:1.9	18 Nov 2005 15: 4:25 -0000
+++ wine/dlls/user/static.c	18 Nov 2005 15: 4:25 -0000
@@ -500,11 +500,11 @@ static void STATIC_PaintTextfn( HWND hwn
 	break;
 
     case SS_SIMPLE:
-	wFormat = DT_LEFT | DT_SINGLELINE | DT_VCENTER;
+        wFormat = DT_LEFT | DT_SINGLELINE;
 	break;
 
     case SS_LEFTNOWORDWRAP:
-	wFormat = DT_LEFT | DT_EXPANDTABS | DT_VCENTER;
+        wFormat = DT_LEFT | DT_EXPANDTABS;
 	break;
 
     default:
@@ -513,8 +513,8 @@ static void STATIC_PaintTextfn( HWND hwn
 
     if (style & SS_NOPREFIX)
 	wFormat |= DT_NOPREFIX;
-    if (style & SS_CENTERIMAGE)
-	wFormat |= DT_VCENTER;
+    if ((style & SS_CENTERIMAGE) && (style & SS_TYPEMASK) != SS_SIMPLE)
+        wFormat |= DT_SINGLELINE | DT_VCENTER;
 
     if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont );