commit 4d975b328f98324872bbdc9838a5f7b14d5e81d1
author Gerard Patel <gerard.patel@asi.fr> Tue Dec 12 00:35:20 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 12 00:35:20 2000 +0000
tree 2f6d92f6c1d59804bea1142ea6358cc1e896eecb
parent 0c86432ea5e297995b54cb0d5ff01e5f99572e7e

Use DrawText to display text in horizontal tabs.

dlls/comctl32/tab.c

diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 66a4142..f30d796 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -1431,7 +1431,7 @@
     /* get the rectangle that the text fits in */
     DrawTextW(hdc, infoPtr->items[iItem].pszText, -1,
               &rcText, DT_CALCRECT);
-
+    rcText.right += 4;
     /*
      * If not owner draw, then do the drawing ourselves.
      *
@@ -1536,15 +1536,28 @@
       hOldFont = SelectObject(hdc, hFont);
     }
 
-    ExtTextOutW(hdc,
-       ((lStyle & TCS_VERTICAL) && (lStyle & TCS_BOTTOM)) ? drawRect->right : drawRect->left,
-       ((lStyle & TCS_VERTICAL) && !(lStyle & TCS_BOTTOM)) ? drawRect->bottom : drawRect->top,
-       0,
-       0,
-       infoPtr->items[iItem].pszText,
-       lstrlenW(infoPtr->items[iItem].pszText),
-       0);
-
+    if (lStyle & TCS_VERTICAL)
+    {
+      ExtTextOutW(hdc,
+      (lStyle & TCS_BOTTOM) ? drawRect->right : drawRect->left,
+      (!(lStyle & TCS_BOTTOM)) ? drawRect->bottom : drawRect->top,
+      0,
+      0,
+      infoPtr->items[iItem].pszText,
+      lstrlenW(infoPtr->items[iItem].pszText),
+      0);
+    }
+    else
+    {
+      DrawTextW
+      (
+        hdc,
+        infoPtr->items[iItem].pszText,
+        lstrlenW(infoPtr->items[iItem].pszText),
+        drawRect,
+        uHorizAlign | DT_SINGLELINE
+        );
+    }
 
     /* clean things up */
     *drawRect = rcTemp; /* restore drawRect */