openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-21 20:45:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

make uiContent_ available after Initialize/Restore

Browse Source 
Signed-off-by: zcdqs <junfeng.lijunfeng@huawei.com>
Change-Id: Idfe1138cdabc19c2bf1b9efb722bb41f72030d09
This commit is contained in:
zcdqs
2022-04-19 18:44:25 +08:00
parent e4b2ddf205
commit f7f7322d25
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/src/window_impl.cpp
+8 -5
View File
@@ -392,20 +392,23 @@ WMError WindowImpl::SetUIContent(const std::string& contentInfo,
NativeEngine* engine, NativeValue* storage, bool isdistributed, AppExecFwk::Ability* ability)
{
WLOGFI("SetUIContent contentInfo: %{public}s", contentInfo.c_str());
std::unique_ptr<Ace::UIContent> uiContent;
if (ability != nullptr) {
uiContent_ = Ace::UIContent::Create(ability);
uiContent = Ace::UIContent::Create(ability);
} else {
uiContent_ = Ace::UIContent::Create(context_.get(), engine);
uiContent = Ace::UIContent::Create(context_.get(), engine);
}
if (uiContent_ == nullptr) {
if (uiContent == nullptr) {
WLOGFE("fail to SetUIContent id: %{public}u", property_->GetWindowId());
return WMError::WM_ERROR_NULLPTR;
}
if (isdistributed) {
uiContent_->Restore(this, contentInfo, storage);
uiContent->Restore(this, contentInfo, storage);
} else {
uiContent_->Initialize(this, contentInfo, storage);
uiContent->Initialize(this, contentInfo, storage);
}
// make uiContent_ available after Initialize/Restore
uiContent_ = std::move(uiContent);
if (state_ == WindowState::STATE_SHOWN) {
Ace::ViewportConfig config;
Rect rect = GetRect();