openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-19 14:43:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!2104 删除无用代码

Browse Source 
Merge pull request !2104 from yangfan229/yangfan
This commit is contained in:
openharmony_ci
2022-03-30 07:29:30 +00:00
committed by Gitee
parent d37102acd0 774045bc47
commit 4dcf38dfdf
4 changed files with 6 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/core/components/box/render_box_base.cpp
+4 -58
View File
@@ -633,51 +633,6 @@ void RenderBoxBase::PerformLayout()
}
}
void RenderBoxBase::PerformLayoutInLiteMode()
{
// Lite must has width and height
CalculateWidth();
CalculateHeight();
ConvertMarginPaddingToPx();
if (NearEqual(selfMaxWidth_, Size::INFINITE_SIZE) && !selfDefineWidth_) {
selfMaxWidth_ = GetLayoutParam().GetMaxSize().Width();
}
if (NearEqual(selfMaxHeight_, Size::INFINITE_SIZE) && !selfDefineHeight_) {
selfMaxHeight_ = GetLayoutParam().GetMaxSize().Height();
}
Size selfMax = Size(selfMaxWidth_, selfMaxHeight_) + margin_.GetLayoutSize();
Size selfMin = Size(selfMinWidth_, selfMinHeight_) + margin_.GetLayoutSize();
// Do not constrain param in lite mode
selfLayoutParam_.SetMaxSize(selfMax);
selfLayoutParam_.SetMinSize(selfMin);
SetChildLayoutParam();
double width = 0.0;
double height = 0.0;
Size borderSize = GetBorderSize();
childSize_ = GetChildren().front()->GetLayoutSize();
if (selfDefineWidth_) {
width = selfMax.Width() - margin_.GetLayoutSize().Width();
} else {
width = childSize_.Width() + padding_.GetLayoutSize().Width() + borderSize.Width();
}
if (selfDefineHeight_) {
height = selfMax.Height() - margin_.GetLayoutSize().Height();
} else {
height = childSize_.Height() + padding_.GetLayoutSize().Height() + borderSize.Height();
}
double targetHeight = padding_.GetLayoutSize().Height() + borderSize.Height();
targetHeight = targetHeight > height ? targetHeight : height;
double targetWidth = padding_.GetLayoutSize().Width() + borderSize.Width();
targetHeight = targetWidth > width ? targetWidth : width;
// Determine self size, not use constrain.
paintSize_ = Size(targetWidth, targetHeight);
selfLayoutSize_ = paintSize_ + margin_.GetLayoutSize();
touchArea_.SetOffset(margin_.GetOffset());
touchArea_.SetSize(paintSize_);
SetLayoutSize(selfLayoutSize_);
CalculateChildPosition();
}
void RenderBoxBase::Update(const RefPtr<Component>& component)
{
const RefPtr<BoxBaseComponent> box = AceType::DynamicCast<BoxBaseComponent>(component);
@@ -756,9 +711,6 @@ void RenderBoxBase::Dump()
}
Size borderSize = GetBorderSize();
Radius radius = GetBorderRadius();
DumpLog::GetInstance().AddDesc("BoxFlex: " + std::to_string(static_cast<int32_t>(flex_)) +
", BGcolor: " + std::to_string(GetColor().GetValue()) + ", BoxSizing: " +
std::to_string(static_cast<int32_t>(boxSizing_)) + ", Align: " + align_.ToString());
DumpLog::GetInstance().AddDesc(std::string("WH: ")
.append(Size(width_.Value(), height_.Value()).ToString())
.append(", Margin: ")
@@ -768,23 +720,17 @@ void RenderBoxBase::Dump()
.append(", Border: ")
.append(borderSize.ToString())
.append(", Radius: ")
.append(radius.GetX().ToString()));
DumpLog::GetInstance().AddDesc(std::string("Constraints: ")
.append(radius.GetX().ToString())
.append(", Constraints: ")
.append(constraints_.ToString())
.append(", ChildLayout: ")
.append(childLayoutParam_.ToString()));
DumpLog::GetInstance().AddDesc(std::string("PaintSize: ")
.append(paintSize_.ToString())
.append(", TouchArea: ")
.append(touchArea_.ToString()));
.append(", BGcolor: ")
.append(std::to_string(GetColor().GetValue())));
DumpLog::GetInstance().AddDesc(std::string("SelfSize: ")
.append(selfLayoutSize_.ToString())
.append(", ChildSize: ")
.append(childSize_.ToString())
.append(", ChildPos: ")
.append(childPosition_.ToString()));
DumpLog::GetInstance().AddDesc(std::string("alignOffset: ")
.append(alignOffset_.ToString()));
if (gridColumnInfo_) {
DumpLog::GetInstance().AddDesc(std::string("GridColumnInfo"));
}
frameworks/core/components/box/render_box_base.h
-1
View File
@@ -309,7 +309,6 @@ protected:
void CalculateSelfLayoutSize();
void CalculateChildPosition();
void AdjustSizeByAspectRatio();
void PerformLayoutInLiteMode();
virtual void OnAnimationCallback();
AnimatableDimension width_ { AnimatableDimension(-1.0, DimensionUnit::PX) }; // exclude margin
frameworks/core/components/coverage/render_coverage.cpp
+2 -2
View File
@@ -42,7 +42,7 @@ void RenderCoverage::PerformLayout()
LayoutParam innerLayout = GetLayoutParam();
auto firstChild = children.begin();
if (firstChild == children.end()) {
LOGE("RenderCoverage: firstChild is null.");
LOGD("RenderCoverage: firstChild is null.");
return;
}
(*firstChild)->Layout(innerLayout);
@@ -51,7 +51,7 @@ void RenderCoverage::PerformLayout()
auto secondChild = ++firstChild;
if (secondChild == children.end()) {
LOGE("RenderCoverage: secondChild is null.");
LOGD("RenderCoverage: secondChild is null.");
return;
}
LayoutParam secondChildLayoutParam;
frameworks/core/pipeline/base/render_node.cpp
-2
View File
@@ -358,8 +358,6 @@ void RenderNode::DumpTree(int32_t depth)
DumpLog::GetInstance().AddDesc(std::string("TouchRectList: ").append(touchRectList));
DumpLog::GetInstance().AddDesc(std::string("DirtyRect: ").append(dirtyRect.ToString()));
DumpLog::GetInstance().AddDesc(std::string("LayoutParam: ").append(layoutParam_.ToString()));
DumpLog::GetInstance().AddDesc(
std::string("MouseState: ").append(mouseState_ == MouseState::HOVER ? "HOVER" : "NONE"));
#ifdef ENABLE_ROSEN_BACKEND
if (rsNode_) {
DumpLog::GetInstance().AddDesc(rsNode_->DumpNode(depth));