From 82e191fc98d3b4941651adad7e11d445e4577272 Mon Sep 17 00:00:00 2001 From: zrb <2454498733@qq.com> Date: Sat, 23 Aug 2025 16:25:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=BB=E4=B8=AD=E7=94=BB=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=8F=98=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- window_scene/session_manager/src/scene_session_manager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 2a77b5a9be..2009094cc2 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -6158,10 +6158,11 @@ void SceneSessionManager::UpdateForceHideState(const sptr& sceneSe bool forceHideFloatOld = !systemTopSceneSessionMap_.empty(); bool notifyAll = false; if (add) { - if (property->GetHideNonSystemFloatingWindows()) { + if (property->GetHideNonSystemFloatingWindows() && sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) { systemTopSceneSessionMap_.insert({ persistentId, sceneSession }); notifyAll = !forceHideFloatOld; - } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling()) || + } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling() && + sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) || sceneSession->GetIsAncoForFloatingWindow()) { nonSystemFloatSceneSessionMap_.insert({ persistentId, sceneSession }); if (forceHideFloatOld) { -- Gitee From 78cb0df5f972c9797d75ceed8cb7493d17ac1383 Mon Sep 17 00:00:00 2001 From: zrb <2454498733@qq.com> Date: Sat, 23 Aug 2025 20:16:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=BB=E4=B8=AD=E7=94=BB=E5=8F=98?= =?UTF-8?q?=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zrb <2454498733@qq.com> --- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 2009094cc2..a9d67aa030 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -6161,7 +6161,7 @@ void SceneSessionManager::UpdateForceHideState(const sptr& sceneSe if (property->GetHideNonSystemFloatingWindows() && sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) { systemTopSceneSessionMap_.insert({ persistentId, sceneSession }); notifyAll = !forceHideFloatOld; - } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling() && + } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling() && sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) || sceneSession->GetIsAncoForFloatingWindow()) { nonSystemFloatSceneSessionMap_.insert({ persistentId, sceneSession }); -- Gitee From 17e4a10c441365299e8a0ded9134fc62b93251d1 Mon Sep 17 00:00:00 2001 From: zrb <2454498733@qq.com> Date: Sat, 23 Aug 2025 20:19:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=BB=E4=B8=AD=E7=94=BB=E5=8F=98?= =?UTF-8?q?=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zrb <2454498733@qq.com> --- window_scene/session_manager/src/scene_session_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index a9d67aa030..17d2e81d86 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -6161,7 +6161,7 @@ void SceneSessionManager::UpdateForceHideState(const sptr& sceneSe if (property->GetHideNonSystemFloatingWindows() && sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) { systemTopSceneSessionMap_.insert({ persistentId, sceneSession }); notifyAll = !forceHideFloatOld; - } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling() && + } else if ((property->IsFloatingWindowAppType() && !property->GetSystemCalling() && sceneSession->GetWindowMode() != WindowMode::WINDOW_MODE_PIP) || sceneSession->GetIsAncoForFloatingWindow()) { nonSystemFloatSceneSessionMap_.insert({ persistentId, sceneSession }); -- Gitee