From bb98bdb183995f25ee5ff92ee298caa32f451c87 Mon Sep 17 00:00:00 2001 From: zyh990312 Date: Tue, 19 Aug 2025 10:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zyh990312 --- interfaces/innerkits/wm/window.h | 2 +- .../window_runtime/window_napi/js_window.cpp | 6 +++--- .../window_stage_napi/js_window_stage.cpp | 2 +- previewer/include/window.h | 2 +- wm/include/window_session_impl.h | 2 +- wm/src/window_scene_session_impl.cpp | 14 +++++++------- wm/src/window_session_impl.cpp | 8 ++++---- wm/test/unittest/window_session_impl_test4.cpp | 18 +++++++++--------- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index fe67e9d0fd..96cf990c81 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -2868,7 +2868,7 @@ public: * * @return True means pcAppInpad and pad window., false means the opposite. */ - virtual bool IsPadAndNotFreeMutiWindowCompatibleMode() const { return false; } + virtual bool IsPadAndNotFreeMultiWindowCompatibleMode() const { return false; } /** * @brief Judge whether SceneBoard is enabled. diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp index 6f236931a8..5092e85b04 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -4295,7 +4295,7 @@ napi_value JsWindow::OnSetWindowTopmost(napi_env env, napi_callback_info info) TLOGE(WmsLogTag::WMS_HIERARCHY, "windowToken is nullptr"); return NapiThrowError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } - if (windowToken_->IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (windowToken_->IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_HIERARCHY, "This is PcAppInPad, not support"); return NapiGetUndefined(env); } @@ -7476,7 +7476,7 @@ napi_value JsWindow::OnSetDecorButtonStyle(napi_env env, napi_callback_info info TLOGE(WmsLogTag::WMS_DECOR, "window is nullptr"); return NapiThrowError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } - if (windowToken_->IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (windowToken_->IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_DECOR, "This is PcAppInPad, not support"); return NapiGetUndefined(env); } @@ -7518,7 +7518,7 @@ napi_value JsWindow::OnGetDecorButtonStyle(napi_env env, napi_callback_info info TLOGE(WmsLogTag::WMS_DECOR, "window is nullptr"); return NapiThrowError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY); } - if (windowToken_->IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (windowToken_->IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_DECOR, "This is PcAppInPad, not support"); return NapiGetUndefined(env); } diff --git a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp index eb3229a3eb..c177bd7902 100644 --- a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp +++ b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp @@ -612,7 +612,7 @@ napi_value JsWindowStage::OnSetWindowModal(napi_env env, napi_callback_info info napi_throw(env, JsErrUtils::CreateJsError(env, WmErrorCode::WM_ERROR_STAGE_ABNORMALLY)); return NapiGetUndefined(env); } - if (window->IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (window->IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_MAIN, "This is PcAppInPad, not support"); return NapiGetUndefined(env); } diff --git a/previewer/include/window.h b/previewer/include/window.h index 7b159c8425..ff2ad38014 100644 --- a/previewer/include/window.h +++ b/previewer/include/window.h @@ -457,7 +457,7 @@ public: virtual bool IsPadWindow() const { return false; } virtual bool IsPcOrFreeMultiWindowCapabilityEnabled() const { return false; } virtual bool IsPcOrPadFreeMultiWindowMode() const { return false; } - virtual bool IsPadAndNotFreeMutiWindowCompatibleMode() const { return false; } + virtual bool IsPadAndNotFreeMultiWindowCompatibleMode() const { return false; } virtual bool IsSceneBoardEnabled() const { return false; } virtual bool GetCompatibleModeInPc() const { return false; } virtual WmErrorCode KeepKeyboardOnFocus(bool keepKeyboardFlag) = 0; diff --git a/wm/include/window_session_impl.h b/wm/include/window_session_impl.h index a8be127b9a..8bf4812387 100644 --- a/wm/include/window_session_impl.h +++ b/wm/include/window_session_impl.h @@ -139,7 +139,7 @@ public: bool IsPadWindow() const override; bool IsPcOrFreeMultiWindowCapabilityEnabled() const override; bool IsPcOrPadFreeMultiWindowMode() const override; - bool IsPadAndNotFreeMutiWindowCompatibleMode() const override; + bool IsPadAndNotFreeMultiWindowCompatibleMode() const override; bool IsSceneBoardEnabled() const override; bool GetCompatibleModeInPc() const override; void HookCompatibleModeAvoidAreaNotify() override; diff --git a/wm/src/window_scene_session_impl.cpp b/wm/src/window_scene_session_impl.cpp index 31da0a9764..88eb23be0c 100644 --- a/wm/src/window_scene_session_impl.cpp +++ b/wm/src/window_scene_session_impl.cpp @@ -664,7 +664,7 @@ WMError WindowSceneSessionImpl::SetPcAppInpadSpecificSystemBarInvisible() { TLOGI(WmsLogTag::WMS_COMPAT, "isPcAppInpadSpecificSystemBarInvisible: %{public}d", property_->GetPcAppInpadSpecificSystemBarInvisible()); - if (WindowHelper::IsMainWindow(GetType()) && IsPadAndNotFreeMutiWindowCompatibleMode() && + if (WindowHelper::IsMainWindow(GetType()) && IsPadAndNotFreeMultiWindowCompatibleMode() && property_->GetPcAppInpadSpecificSystemBarInvisible()) { SystemBarProperty statusProperty = GetSystemBarPropertyByType(WindowType::WINDOW_TYPE_STATUS_BAR); UpdateSpecificSystemBarEnabled(false, false, statusProperty); @@ -683,7 +683,7 @@ WMError WindowSceneSessionImpl::SetPcAppInpadOrientationLandscape() { TLOGI(WmsLogTag::WMS_COMPAT, "isPcAppInpadOrientationLandscape: %{public}d", property_->GetPcAppInpadOrientationLandscape()); - if (WindowHelper::IsMainWindow(GetType()) && IsPadAndNotFreeMutiWindowCompatibleMode() && + if (WindowHelper::IsMainWindow(GetType()) && IsPadAndNotFreeMultiWindowCompatibleMode() && property_->GetPcAppInpadOrientationLandscape()) { SetRequestedOrientation(Orientation::HORIZONTAL, false); return WMError::WM_OK; @@ -2952,7 +2952,7 @@ WMError WindowSceneSessionImpl::SetTitleAndDockHoverShown( TLOGE(WmsLogTag::WMS_LAYOUT_PC, "window is not main window"); return WMError::WM_ERROR_INVALID_CALLING; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_LAYOUT_PC, "This is PcAppInPad, not supported"); return WMError::WM_OK; } @@ -3539,7 +3539,7 @@ WMError WindowSceneSessionImpl::Recover(uint32_t reason) TLOGE(WmsLogTag::WMS_LAYOUT_PC, "session is invalid"); return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_LAYOUT_PC, "The device is not supported"); return WMError::WM_OK; } @@ -3589,7 +3589,7 @@ WMError WindowSceneSessionImpl::SetWindowRectAutoSave(bool enabled, bool isSaveB return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_MAIN, "This is PcAppInPad, not supported"); return WMError::WM_OK; } @@ -3662,7 +3662,7 @@ WMError WindowSceneSessionImpl::SetSupportedWindowModes( return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_LAYOUT_PC, "This is PcAppInpad, not supported"); return WMError::WM_OK; } @@ -5893,7 +5893,7 @@ WMError WindowSceneSessionImpl::SetFollowParentMultiScreenPolicy(bool enabled) if (IsWindowSessionInvalid()) { return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_SUB, "This is PcAppInpad, not Suppored"); return WMError::WM_OK; } diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index 7cf109a269..53f8720a29 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -344,7 +344,7 @@ bool WindowSessionImpl::IsPcOrPadFreeMultiWindowMode() const return windowSystemConfig_.IsPcWindow() || IsFreeMultiWindowMode(); } -bool WindowSessionImpl::IsPadAndNotFreeMutiWindowCompatibleMode() const +bool WindowSessionImpl::IsPadAndNotFreeMultiWindowCompatibleMode() const { return property_->GetPcAppInpadCompatibleMode() && !IsFreeMultiWindowMode(); @@ -2647,7 +2647,7 @@ WMError WindowSessionImpl::SetWindowDelayRaiseEnabled(bool isEnabled) if (IsWindowSessionInvalid()) { return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_FOCUS, "The is PcAppInPad, not supported"); return WMError::WM_OK; } @@ -3345,7 +3345,7 @@ WMError WindowSessionImpl::SetWindowTitleMoveEnabled(bool enable) if (IsWindowSessionInvalid()) { return WMError::WM_ERROR_INVALID_WINDOW; } - if (IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_DECOR, "The is PcAppInPad, not supported"); return WMError::WM_OK; } @@ -3376,7 +3376,7 @@ WMError WindowSessionImpl::SetSubWindowModal(bool isModal, ModalityType modality TLOGE(WmsLogTag::WMS_SUB, "called by invalid window type, type:%{public}d", GetType()); return WMError::WM_ERROR_INVALID_CALLING; } - if (modalityType == ModalityType::APPLICATION_MODALITY && IsPadAndNotFreeMutiWindowCompatibleMode()) { + if (modalityType == ModalityType::APPLICATION_MODALITY && IsPadAndNotFreeMultiWindowCompatibleMode()) { TLOGE(WmsLogTag::WMS_SUB, "This is PcAppInPad, not support"); return WMError::WM_OK; } diff --git a/wm/test/unittest/window_session_impl_test4.cpp b/wm/test/unittest/window_session_impl_test4.cpp index eb4f619286..6c199843fd 100644 --- a/wm/test/unittest/window_session_impl_test4.cpp +++ b/wm/test/unittest/window_session_impl_test4.cpp @@ -485,15 +485,15 @@ HWTEST_F(WindowSessionImplTest4, IsPcWindow, TestSize.Level1) } /** - * @tc.name: IsPadAndNotFreeMutiWindowCompatibleMode - * @tc.desc: IsPadAndNotFreeMutiWindowCompatibleMode + * @tc.name: IsPadAndNotFreeMultiWindowCompatibleMode + * @tc.desc: IsPadAndNotFreeMultiWindowCompatibleMode * @tc.type: FUNC */ -HWTEST_F(WindowSessionImplTest4, IsPadAndNotFreeMutiWindowCompatibleMode, TestSize.Level1) +HWTEST_F(WindowSessionImplTest4, IsPadAndNotFreeMultiWindowCompatibleMode, TestSize.Level1) { - GTEST_LOG_(INFO) << "WindowSessionImplTest4: IsPadAndNotFreeMutiWindowCompatibleMode start"; + GTEST_LOG_(INFO) << "WindowSessionImplTest4: IsPadAndNotFreeMultiWindowCompatibleMode start"; sptr option = sptr::MakeSptr(); - option->SetWindowName("IsPadAndNotFreeMutiWindowCompatibleMode"); + option->SetWindowName("IsPadAndNotFreeMultiWindowCompatibleMode"); option->SetWindowType(WindowType::WINDOW_TYPE_APP_SUB_WINDOW); sptr window = sptr::MakeSptr(option); window->property_->SetPersistentId(1); @@ -503,13 +503,13 @@ HWTEST_F(WindowSessionImplTest4, IsPadAndNotFreeMutiWindowCompatibleMode, TestSi window->windowSystemConfig_.windowUIType_ = WindowUIType::PAD_WINDOW; window->property_->SetPcAppInpadCompatibleMode(true); window->windowSystemConfig_.freeMultiWindowEnable_ = false; - EXPECT_EQ(true, window->IsPadAndNotFreeMutiWindowCompatibleMode()); + EXPECT_EQ(true, window->IsPadAndNotFreeMultiWindowCompatibleMode()); window->windowSystemConfig_.windowUIType_ = WindowUIType::PAD_WINDOW; window->property_->SetPcAppInpadCompatibleMode(true); window->windowSystemConfig_.freeMultiWindowEnable_ = true; - window->windowSystemConfig_.isSystemDecorEnable_ = true; - EXPECT_EQ(false, window->IsPadAndNotFreeMutiWindowCompatibleMode()); - GTEST_LOG_(INFO) << "WindowSessionImplTest4: IsPadAndNotFreeMutiWindowCompatibleMode end"; + window->windowSystemConfig_.freeMultiWindowSupport_ = true; + EXPECT_EQ(false, window->IsPadAndNotFreeMultiWindowCompatibleMode()); + GTEST_LOG_(INFO) << "WindowSessionImplTest4: IsPadAndNotFreeMultiWindowCompatibleMode end"; } /** -- Gitee