dwrite: Support DWRITE_TRIMMING_GRANULARITY_WORD mode.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Support DWRITE_TRIMMING_GRANULARITY_WORD mode.
096df5f5 · Nikolay Sivov · Alexandre Julliard · 9058fc0a · 096df5f5
Commit 096df5f5 authored Sep 11, 2017 by Nikolay Sivov Committed by Alexandre Julliard Sep 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

layout.c dlls/dwrite/layout.c +9 -1

No files found.
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -1879,7 +1879,15 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust
            while (last_cluster > first_cluster) {
                if (trimmed_width + sign_metrics.width <= layout->metrics.layoutWidth)
                    break;
-                trimmed_width -= layout->clustermetrics[last_cluster--].width;
+                if (layout->format.trimming.granularity == DWRITE_TRIMMING_GRANULARITY_CHARACTER)
+                    trimmed_width -= layout->clustermetrics[last_cluster--].width;
+                else {
+                    while (last_cluster > first_cluster) {
+                        trimmed_width -= layout->clustermetrics[last_cluster].width;
+                        if (layout->clustermetrics[last_cluster--].canWrapLineAfter)
+                            break;
+                    }
+                }
            }
            append_trimming_run = TRUE;
        }