user32: Fix rendering of tabs in edit control.

Signed-off-by: Tim Worthington <tim@pcbelegance.org> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Fix rendering of tabs in edit control.
4f96439e · Tim Worthington · Alexandre Julliard · 5bd636dc · 4f96439e · 4f96439e
Commit 4f96439e authored Jul 22, 2017 by Tim Worthington Committed by Alexandre Julliard Jul 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

edit.c dlls/user32/edit.c +1 -1

usp10.c dlls/usp10/usp10.c +8 -3

No files found.
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -411,7 +411,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD
 			old_font = SelectObject(udc, es->font);
 		tabdef.cTabStops = es->tabs_count;
-		tabdef.iScale = 0;
+		tabdef.iScale = GdiGetCharDimensions(udc, NULL, NULL);
 		tabdef.pTabStops = es->tabs;
 		tabdef.iTabOrigin = 0;

--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1828,7 +1828,12 @@ static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int
        cTabStops = 0;
    }
    else
-        defWidth = 8 * psc->tm.tmAveCharWidth;
+    {
+        if (pTabdef->iScale)
+            defWidth = (32 * pTabdef->iScale) / 4;
+        else
+            defWidth = 8 * psc->tm.tmAveCharWidth;
+    }
    for (; cTabStops>0 ; lpTabPos++, cTabStops--)
    {
@@ -1842,10 +1847,10 @@ static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int
        if( nTabOrg + position > current_x)
        {
-            if( *lpTabPos >= 0)
+            if( position >= 0)
            {
                /* a left aligned tab */
-                x = (nTabOrg + *lpTabPos) - current_x;
+                x = (nTabOrg + position) - current_x;
                break;
            }
            else