openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-03-01 21:07:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!36900 修复系统设置字号和粗细调整measure接口返回宽高不准确问题

Browse Source 
Merge pull request !36900 from zhouyan/fixScaleMeasure
This commit is contained in:
openharmony_ci 2024-07-04 16:07:17 +00:00 committed by Gitee
commit dc46716019
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frameworks/core/components/custom_paint/rosen_render_custom_paint.cpp
View File

@ -649,6 +649,13 @@ double RosenRenderCustomPaint::MeasureTextInner(const MeasureContext& context)
txtStyle.fontStyle = ConvertTxtFontStyle(context.fontStyle);
FontWeight fontWeightStr = StringUtils::StringToFontWeight(context.fontWeight);
txtStyle.fontWeight = ConvertTxtFontWeight(fontWeightStr);
auto fontWeightValue = (static_cast<int32_t>(
ConvertTxtFontWeight(fontWeightStr)) + 1) * 100;
auto pipelineContext = PipelineBase::GetCurrentContextSafely();
if (pipelineContext) {
fontWeightValue = fontWeightValue * pipelineContext->GetFontWeightScale();
}
txtStyle.fontVariations.SetAxisValue(FONTWEIGHT, fontWeightValue);
StringUtils::StringSplitter(context.fontFamily, ',', fontFamilies);
txtStyle.fontFamilies = fontFamilies;
if (context.letterSpacing.has_value()) {
@ -693,17 +700,14 @@ bool RosenRenderCustomPaint::IsApplyIndent(const MeasureContext& context, double
void RosenRenderCustomPaint::ApplyLineHeightInNumUnit(const MeasureContext& context, Rosen::TextStyle& txtStyle)
{
auto lineHeight = context.lineHeight.value().Value();
auto pipelineContext = PipelineBase::GetCurrentContext();
if (pipelineContext) {
lineHeight = pipelineContext->NormalizeToPx(context.lineHeight.value());
}
auto lineHeight = context.lineHeight.value().ConvertToPx();
txtStyle.heightOnly = true;
if (!NearEqual(lineHeight, txtStyle.fontSize) && (lineHeight > 0.0) && (!NearZero(txtStyle.fontSize))) {
txtStyle.heightScale = lineHeight / txtStyle.fontSize;
} else {
txtStyle.heightScale = 1;
static const int32_t BEGIN_VERSION = 6;
auto pipelineContext = PipelineBase::GetCurrentContextSafely();
auto isBeginVersion = pipelineContext && pipelineContext->GetMinPlatformVersion() >= BEGIN_VERSION;
if (NearZero(lineHeight) || (!isBeginVersion && NearEqual(lineHeight, txtStyle.fontSize))) {
txtStyle.heightOnly = false;