From b27a1811f915ae84153adfeebd3685d4dda59a00 Mon Sep 17 00:00:00 2001 From: Lighter <11192910+lighter_wei@user.noreply.gitee.com> Date: Mon, 25 Aug 2025 02:15:14 +0000 Subject: [PATCH 1/3] update wm/src/window_session_impl.cpp. Signed-off-by: Lighter <11192910+lighter_wei@user.noreply.gitee.com> --- wm/src/window_session_impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index b86a6efab9..1e7c8ce940 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2338,7 +2338,8 @@ void WindowSessionImpl::UpdateDecorEnableToAce(bool isDecorEnable) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)); + (property_->GetIsPcAppInPad() && isSubWindow)) && + !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); } uiContent->UpdateDecorVisible(decorVisible, isDecorEnable); return; @@ -2366,7 +2367,8 @@ void WindowSessionImpl::UpdateDecorEnable(bool needNotify, WindowMode mode) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)); + (property_->GetIsPcAppInPad() && isSubWindow)) && + !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); } if (GetWindowMode() == WindowMode::WINDOW_MODE_FULLSCREEN && property_->IsDecorFullscreenDisabled()) { decorVisible = false; -- Gitee From db55d9a0aaa0cf4ba43a0e004fdb9fcd6cfcda08 Mon Sep 17 00:00:00 2001 From: Lighter Date: Mon, 25 Aug 2025 09:03:50 +0000 Subject: [PATCH 2/3] Revert "update wm/src/window_session_impl.cpp." This reverts commit b27a1811f915ae84153adfeebd3685d4dda59a00. --- wm/src/window_session_impl.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index 1e7c8ce940..b86a6efab9 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2338,8 +2338,7 @@ void WindowSessionImpl::UpdateDecorEnableToAce(bool isDecorEnable) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)) && - !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); + (property_->GetIsPcAppInPad() && isSubWindow)); } uiContent->UpdateDecorVisible(decorVisible, isDecorEnable); return; @@ -2367,8 +2366,7 @@ void WindowSessionImpl::UpdateDecorEnable(bool needNotify, WindowMode mode) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)) && - !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); + (property_->GetIsPcAppInPad() && isSubWindow)); } if (GetWindowMode() == WindowMode::WINDOW_MODE_FULLSCREEN && property_->IsDecorFullscreenDisabled()) { decorVisible = false; -- Gitee From e189d6bff880f24edda27838195ed59c48d7cc54 Mon Sep 17 00:00:00 2001 From: Lighter Date: Mon, 25 Aug 2025 09:06:01 +0000 Subject: [PATCH 3/3] update wm/src/window_session_impl.cpp. Signed-off-by: Lighter --- wm/src/window_session_impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index b86a6efab9..1e7c8ce940 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2338,7 +2338,8 @@ void WindowSessionImpl::UpdateDecorEnableToAce(bool isDecorEnable) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)); + (property_->GetIsPcAppInPad() && isSubWindow)) && + !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); } uiContent->UpdateDecorVisible(decorVisible, isDecorEnable); return; @@ -2366,7 +2367,8 @@ void WindowSessionImpl::UpdateDecorEnable(bool needNotify, WindowMode mode) if (windowSystemConfig_.freeMultiWindowSupport_) { auto isSubWindow = WindowHelper::IsSubWindow(GetType()); decorVisible = decorVisible && (windowSystemConfig_.freeMultiWindowEnable_ || - (property_->GetIsPcAppInPad() && isSubWindow)); + (property_->GetIsPcAppInPad() && isSubWindow)) && + !(mode == WindowMode::WINDOW_MODE_FULLSCREEN && property_->GetCompatibleModeProperty()); } if (GetWindowMode() == WindowMode::WINDOW_MODE_FULLSCREEN && property_->IsDecorFullscreenDisabled()) { decorVisible = false; -- Gitee