Nikolay Sivov : dwrite: Reuse linebreaking whitespace flag when filling cluster metrics.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 00766538c57e62549c4fbdce6b3c99a2d4791658
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=00766538c57e62549c4fbdce6b3c99a2d4791658

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jan 26 15:44:45 2016 +0300

dwrite: Reuse linebreaking whitespace flag when filling cluster metrics.

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

---

 dlls/dwrite/layout.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index b6f4a65..241616b 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -612,10 +612,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout,
     metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK ||
                                 breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK;
     if (metrics->length == 1) {
-        WORD type = 0;
-
-        GetStringTypeW(CT_CTYPE1, &layout->str[position], 1, &type);
-        metrics->isWhitespace = !!(type & C1_SPACE);
+        metrics->isWhitespace = get_effective_breakpoint(layout, position).isWhitespace;
         metrics->isNewline = FALSE /* FIXME */;
         metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */;
     }