From eac2859c697b751b79479d84a9c292879217f8a4 Mon Sep 17 00:00:00 2001 From: FTL1ght Date: Tue, 9 Sep 2025 17:28:43 +0800 Subject: [PATCH 1/2] Fix tab fuc if break strategy is balanced Signed-off-by: FTL1ght Change-Id: Iad66310840287d0a24ecc9eb4011bf147b52b6c3 --- m133/modules/skparagraph/src/TextWrapper.cpp | 3 ++- modules/skparagraph/src/TextWrapper.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/m133/modules/skparagraph/src/TextWrapper.cpp b/m133/modules/skparagraph/src/TextWrapper.cpp index b8998b845d..cec691b1ef 100644 --- a/m133/modules/skparagraph/src/TextWrapper.cpp +++ b/m133/modules/skparagraph/src/TextWrapper.cpp @@ -932,7 +932,8 @@ void TextWrapper::breakTextIntoLines(ParagraphImpl* parent, if (fParent->getLineBreakStrategy() == LineBreakStrategy::BALANCED && fParent->getWordBreakType() != WordBreakType::BREAK_ALL && - fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN) { + fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN && + (fParent->getParagraphStyle().getTextTab().location < 1.0)) { layoutLinesBalanced(parent, maxWidth, addLine); return; } diff --git a/modules/skparagraph/src/TextWrapper.cpp b/modules/skparagraph/src/TextWrapper.cpp index 6b34009cc9..d735575c60 100644 --- a/modules/skparagraph/src/TextWrapper.cpp +++ b/modules/skparagraph/src/TextWrapper.cpp @@ -931,7 +931,8 @@ void TextWrapper::breakTextIntoLines(ParagraphImpl* parent, if (fParent->getLineBreakStrategy() == LineBreakStrategy::BALANCED && fParent->getWordBreakType() != WordBreakType::BREAK_ALL && - fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN) { + fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN && + (fParent->getParagraphStyle().getTextTab().location < 1.0)) { layoutLinesBalanced(parent, maxWidth, addLine); return; } -- Gitee From 4f08abd2c063680eb1bc18506c01cdcc01a1f4dc Mon Sep 17 00:00:00 2001 From: FTL1ght Date: Wed, 10 Sep 2025 10:55:48 +0800 Subject: [PATCH 2/2] Fix Signed-off-by: FTL1ght Change-Id: Ib2991c158d013de1306518aae25e21bfa842ff65 --- m133/modules/skparagraph/src/TextWrapper.cpp | 2 +- modules/skparagraph/src/TextWrapper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m133/modules/skparagraph/src/TextWrapper.cpp b/m133/modules/skparagraph/src/TextWrapper.cpp index cec691b1ef..cefe26259d 100644 --- a/m133/modules/skparagraph/src/TextWrapper.cpp +++ b/m133/modules/skparagraph/src/TextWrapper.cpp @@ -933,7 +933,7 @@ void TextWrapper::breakTextIntoLines(ParagraphImpl* parent, if (fParent->getLineBreakStrategy() == LineBreakStrategy::BALANCED && fParent->getWordBreakType() != WordBreakType::BREAK_ALL && fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN && - (fParent->getParagraphStyle().getTextTab().location < 1.0)) { + (fParent->getParagraphStyle().getTextTab().location < 0)) { layoutLinesBalanced(parent, maxWidth, addLine); return; } diff --git a/modules/skparagraph/src/TextWrapper.cpp b/modules/skparagraph/src/TextWrapper.cpp index d735575c60..6902a37894 100644 --- a/modules/skparagraph/src/TextWrapper.cpp +++ b/modules/skparagraph/src/TextWrapper.cpp @@ -932,7 +932,7 @@ void TextWrapper::breakTextIntoLines(ParagraphImpl* parent, if (fParent->getLineBreakStrategy() == LineBreakStrategy::BALANCED && fParent->getWordBreakType() != WordBreakType::BREAK_ALL && fParent->getWordBreakType() != WordBreakType::BREAK_HYPHEN && - (fParent->getParagraphStyle().getTextTab().location < 1.0)) { + (fParent->getParagraphStyle().getTextTab().location < 0)) { layoutLinesBalanced(parent, maxWidth, addLine); return; } -- Gitee