openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-23 23:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!10176 UiExtFirstFlag使用调整

Browse Source 
Merge pull request !10176 from thks/fixUiExtFlag
This commit is contained in:
openharmony_ci 2024-11-04 09:55:59 +00:00 committed by Gitee
commit 9afc175686
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/innerkits/wm/window.h
View File

@ -2418,7 +2418,7 @@ public:
virtual void NotifyExtensionEventAsync(uint32_t notifyEvent) {}
/**
* @brief Get isUIExtFirstSubWindow flag
* @brief Get whether this window is the first level sub window of UIExtension.
*
* @return true - is the first sub window of UIExtension, false - is not the first sub window of UIExtension
*/

4
interfaces/innerkits/wm/window_option.h
View File

@ -231,7 +231,7 @@ public:
void SetOnlySupportSceneBoard(bool onlySupportSceneBoard);
/**
* @brief Set whether this window is the first sub window of UIExtension.
* @brief Set whether this window is the first level sub window of UIExtension.
*
* @param isUIExtFirstSubWindow whether is the first sub window of UIExtension.
*/
@ -427,7 +427,7 @@ public:
bool GetOnlySupportSceneBoard() const;
/**
* @brief Get isUIExtFirstSubWindow flag
* @brief Get whether this window is the first level sub window of UIExtension.
*
* @return true - is the first sub window of UIExtension, false - is not the first sub window of UIExtension
*/

2
wm/src/window_scene_session_impl.cpp
View File

@ -1343,7 +1343,7 @@ WMError WindowSceneSessionImpl::DestroyInner(bool needNotifyServer)
if (WindowHelper::IsSystemWindow(GetType())) {
// main window no need to notify host, since host knows hide first
ret = SyncDestroyAndDisconnectSpecificSession(property_->GetPersistentId());
} else if (WindowHelper::IsSubWindow(GetType()) && property_->GetIsUIExtFirstSubWindow()) {
} else if (WindowHelper::IsSubWindow(GetType()) && !property_->GetIsUIExtFirstSubWindow()) {
auto parentSession = FindParentSessionByParentId(GetParentId());
if (parentSession == nullptr || parentSession->GetHostSession() == nullptr) {
return WMError::WM_ERROR_NULLPTR;