openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-10-07 08:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reduce the diff of code.

Browse Source 
Signed-off-by: ZhangYu <zhangyu578@huawei.com>
This commit is contained in:
ZhangYu 2024-09-20 07:46:16 +00:00
parent e105d3e177
commit 2f3b071be6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/core/components_ng/base/geometry_node.h
View File

@ -140,9 +140,9 @@ public:
frame_.rect_.SetSize(size);
}
void SetFrameHeight(const float height)
void SetFrameHeight(const float heigth)
{
frame_.rect_.SetHeight(height);
frame_.rect_.SetHeight(heigth);
}
void SetFrameWidth(const float width)

6
frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp
View File

@ -48,7 +48,7 @@ bool SafeAreaManager::UpdateCutoutSafeArea(const SafeAreaInsets& safeArea, NG::O
if (cutoutSafeArea_ == cutoutArea) {
return false;
}
ACE_SCOPED_TRACE("SafeAreaManager::UpdateCutoutSafeArea %s", safeArea.ToString().c_str());
ACE_SCOPED_TRACE("SafeAreaManager::UpdateCutoutSafeArea %s", cutoutArea.ToString().c_str());
cutoutSafeArea_ = cutoutArea;
return true;
}
@ -152,7 +152,7 @@ bool SafeAreaManager::SetKeyBoardAvoidMode(bool value)
return false;
}
keyboardSafeAreaEnabled_ = value;
LOGI("SafeAreaManager::SetKeyBoardAvoidMode %{public}d", int(keyboardSafeAreaEnabled_));
LOGI("SafeAreaManager::SetKeyBoardAvoidMode %{public}d", keyboardSafeAreaEnabled_);
return true;
}
@ -162,7 +162,7 @@ bool SafeAreaManager::SetIsAtomicService(bool value)
return false;
}
isAtomicService_ = value;
LOGI("SafeAreaManager::SetIsAtomicService %{public}d", int(isAtomicService_));
LOGI("SafeAreaManager::SetIsAtomicService %{public}d", isAtomicService_);
return true;
}

2
frameworks/core/components_ng/pattern/canvas/custom_paint_paint_method.cpp
View File

@ -135,7 +135,7 @@ bool CustomPaintPaintMethod::CheckFilterProperty(FilterType filterType, const st
return std::regex_match(filterParam, contrastRegexExpression);
}
case FilterType::BLUR: {
std::regex blurRegexExpression(R"((\d+(\.\d+)?(px|vp|rem))|(^$))");
std::regex blurRegexExpression(R"((-?0)|(\d+(\.\d+)?(px|vp|rem))|(^$))");
return std::regex_match(filterParam, blurRegexExpression);
}
case FilterType::HUE_ROTATE: {