[WIN32SS][COMCTL32] Improve button text position (#2135)
authorKatayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Mon, 9 Dec 2019 12:16:28 +0000 (21:16 +0900)
committerGitHub <noreply@github.com>
Mon, 9 Dec 2019 12:16:28 +0000 (21:16 +0900)
Improve DrawText function especially DT_CALCRECT and DT_VCENTER. CORE-15478

win32ss/user/rtl/text.c

index 7670e2e..8963b0d 100644 (file)
@@ -1263,18 +1263,8 @@ INT WINAPI DrawTextExWorker( HDC hdc,
        if (flags & DT_SINGLELINE)
        {
 #ifdef __REACTOS__
-        if (flags & DT_VCENTER)
-        {
-            if (flags & DT_CALCRECT)
-            {
-                if (rect->bottom - rect->top < size.cy / 2)
-                    y = rect->top + (invert_y ? size.cy : -size.cy) / 2;
-            }
-            else
-            {
-                y = rect->top + (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2;
-            }
-        }
+        if (flags & DT_VCENTER) y = rect->top +
+            (rect->bottom - rect->top + (invert_y ? size.cy : -size.cy)) / 2;
         else if (flags & DT_BOTTOM)
             y = rect->bottom + (invert_y ? 0 : -size.cy);
 #else