[PATCH] comctl32: statusbar: change the height expression to one that seems to be the same as in Windows

Mikołaj Zalewski mikolaj at zalewski.pl
Wed Jul 16 13:27:41 CDT 2008


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

diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index aa18696..d2b9c0d 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -116,7 +116,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr)
     TEXTMETRICW tm;
     
     COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm);
-    height = tm.tmHeight + 4 + infoPtr->verticalBorder;
+    height = tm.tmHeight + tm.tmInternalLeading + 2 + infoPtr->verticalBorder;
 
     if ((theme = GetWindowTheme(infoPtr->Self)))
     {
diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c
index b6c5b7b..7aabf62 100644
--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -122,7 +122,7 @@ static void test_setfont()
     ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n");
 
     GetClientRect(hwndStatus, &rc2);
-    todo_wine expect_rect(0, 0, 672, 42, rc2);
+    todo_wine expect_rect(0, 0, 672, 42, rc2); /* GetTextMetrics returns inclued tmInternalLeading for this font */
 
     g_wmsize_count = 0;
     SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE);
-- 
1.5.4


--------------090608040302050401060305--



More information about the wine-patches mailing list