openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-18 20:54:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

!2342 bugfix with focusable and backgroundImage

Browse Source 
Merge pull request !2342 from lee/master
This commit is contained in:
openharmony_ci
2022-04-27 03:00:26 +00:00
committed by Gitee
parent c100863748 68424148b1
commit fcd464a4c2
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/bridge/declarative_frontend/view_stack_processor.cpp
+5
View File
@@ -658,6 +658,11 @@ RefPtr<Component> ViewStackProcessor::WrapComponents()
coverageComponent->AppendChild(menuComponent);
}
}
auto focusableComponent = AceType::DynamicCast<FocusableComponent>(components[idx - 1]);
if (focusableComponent) {
Component::MergeRSNode(components[idx], focusableComponent);
}
}
auto component = components.front();
frameworks/core/components/box/rosen_render_box.cpp
+12 -2
View File
@@ -906,8 +906,18 @@ void RosenRenderBox::SetBackgroundPosition(const BackgroundImagePosition& positi
LOGE("set background position to rsNode failed, rsNode is null");
return;
}
rsNode->SetBgImagePositionX(position.GetSizeValueX());
rsNode->SetBgImagePositionY(position.GetSizeValueY());
if (position.GetSizeTypeX() == BackgroundImagePositionType::PX) {
rsNode->SetBgImagePositionX(position.GetSizeValueX());
} else {
rsNode->SetBgImagePositionX(position.GetSizeValueX() *
(paintSize_.Width() - rsNode->GetStagingProperties().GetBgImageWidth()) / PERCENT_TRANSLATE);
}
if (position.GetSizeTypeX() == BackgroundImagePositionType::PX) {
rsNode->SetBgImagePositionX(position.GetSizeValueX());
} else {
rsNode->SetBgImagePositionY(position.GetSizeValueY() *
(paintSize_.Height() - rsNode->GetStagingProperties().GetBgImageHeight()) / PERCENT_TRANSLATE);
}
}
void RosenRenderBox::SetShadow(const Shadow& shadow)