From 0ccb38698effd7a7d2c638ebd744fe281caa4285 Mon Sep 17 00:00:00 2001 From: zhanglitao Date: Tue, 24 Oct 2023 17:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAlign=E8=AE=BE=E4=B8=BACenter?= =?UTF-8?q?=E6=88=96End=E4=B9=8B=E5=90=8E=E6=8D=A2=E8=A1=8C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanglitao --- txt/src/minikin/LineBreaker.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/txt/src/minikin/LineBreaker.cpp b/txt/src/minikin/LineBreaker.cpp index 32016e0f..353018fa 100644 --- a/txt/src/minikin/LineBreaker.cpp +++ b/txt/src/minikin/LineBreaker.cpp @@ -129,13 +129,12 @@ float LineBreaker::addStyleRun(MinikinPaint* paint, size_t end, bool isRtl) { float width = 0.0f; - int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; float hyphenPenalty = 0.0; if (paint != nullptr) { width = Layout::measureText(mTextBuf.data(), start, end - start, - mTextBuf.size(), bidiFlags, style, *paint, - typeface, mCharWidths.data() + start); + mTextBuf.size(), isRtl, style, *paint, typeface, + mCharWidths.data() + start); // a heuristic that seems to perform well hyphenPenalty = @@ -202,12 +201,12 @@ float LineBreaker::addStyleRun(MinikinPaint* paint, paint->hyphenEdit = HyphenEdit::editForThisLine(hyph); const float firstPartWidth = Layout::measureText( mTextBuf.data(), lastBreak, j - lastBreak, mTextBuf.size(), - bidiFlags, style, *paint, typeface, nullptr); + isRtl, style, *paint, typeface, nullptr); ParaWidth hyphPostBreak = lastBreakWidth + firstPartWidth; paint->hyphenEdit = HyphenEdit::editForNextLine(hyph); const float secondPartWidth = Layout::measureText( - mTextBuf.data(), j, afterWord - j, mTextBuf.size(), bidiFlags, + mTextBuf.data(), j, afterWord - j, mTextBuf.size(), isRtl, style, *paint, typeface, nullptr); ParaWidth hyphPreBreak = postBreak - secondPartWidth; -- Gitee