[PATCH 2/5] dwrite: Reuse linebreaking whitespace flag when filling cluster metrics
Nikolay Sivov
nsivov at codeweavers.com
Tue Jan 26 06:44:45 CST 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
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 */;
}
--
2.7.0.rc3
More information about the wine-patches
mailing list