diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index 3575de6218cca62a2cb8eda88a2ea1407d1f384e..19206d999ac1fc0525f2ab02f7cddd2e6a4f4440 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -1561,8 +1561,7 @@ public: * @param height * @return WMError */ - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) { return WMError::WM_OK; } + virtual WMError Resize(uint32_t width, uint32_t height) { return WMError::WM_OK; } /** * @brief resize the window instance (w,h) @@ -1571,8 +1570,7 @@ public: * @param height * @return WMError */ - virtual WMError ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + virtual WMError ResizeAsync(uint32_t width, uint32_t height) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } /** * @brief set the window gravity 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 45109c824aed85a7195b8e62219e76a5d453d4ca..e14b2e488061b1ea8ee2432fd51616787f3eeb55 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -2287,7 +2287,7 @@ static void SetResizeWindowWithAnimationAsyncTask(NapiAsyncTask::ExecuteCallback *errCodePtr = WmErrorCode::WM_ERROR_STATE_ABNORMALLY; return; } - *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at(window->ResizeAsync(rect.width_, rect.height_, rectAnimationConfig)); + *errCodePtr = WM_JS_TO_ERROR_CODE_MAP.at(window->ResizeAsync(rect.width_, rect.height_)); TLOGND(WmsLogTag::WMS_LAYOUT, "%{public}s end, window [%{public}u, %{public}s] err=%{public}d", where, window->GetWindowId(), window->GetWindowName().c_str(), *errCodePtr); }; diff --git a/previewer/include/window_impl.h b/previewer/include/window_impl.h index c7133b26e5026a55ee9fa3dc9a6f6e305d3aa493..1d3fce87ef64c1a6b600a226f483797e4a7bf99b 100644 --- a/previewer/include/window_impl.h +++ b/previewer/include/window_impl.h @@ -111,8 +111,7 @@ public: virtual WMError Hide(uint32_t reason, bool withAnimation, bool isFromInnerkits, bool waitDetach) override; virtual WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + virtual WMError Resize(uint32_t width, uint32_t height) override; virtual WMError SetWindowGravity(WindowGravity gravity, uint32_t percent) override; virtual WMError SetKeepScreenOn(bool keepScreenOn) override; virtual bool IsKeepScreenOn() const override; diff --git a/previewer/src/window_impl.cpp b/previewer/src/window_impl.cpp index fd0fc0ba7da920258c1a4420c20773b4e7b61f78..6349e43ae3822f3b08e517890c38d9f889ef2ca9 100644 --- a/previewer/src/window_impl.cpp +++ b/previewer/src/window_impl.cpp @@ -585,7 +585,7 @@ WMError WindowImpl::MoveTo(int32_t x, int32_t y, bool isMoveToGlobal, MoveConfig return WMError::WM_OK; } -WMError WindowImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowImpl::Resize(uint32_t width, uint32_t height) { return WMError::WM_OK; } diff --git a/window_scene/common/include/window_session_property.h b/window_scene/common/include/window_session_property.h index 4a5dc4d6f54910a59c92a5e66039b7f1d4959170..83f80b94de48ce8e75f4c0f9a0b848b3050e6322 100755 --- a/window_scene/common/include/window_session_property.h +++ b/window_scene/common/include/window_session_property.h @@ -815,9 +815,11 @@ struct SystemSessionConfig : public Parcelable { return false; } - if (!parcel.WriteUint32(miniWidthOfMainWindow_) || !parcel.WriteUint32(miniHeightOfMainWindow_) || - !parcel.WriteUint32(miniWidthOfSubWindow_) || !parcel.WriteUint32(miniHeightOfSubWindow_) || - !parcel.WriteUint32(miniWidthOfDialogWindow_) || !parcel.WriteUint32(miniHeightOfDialogWindow_)) { + bool parcelWriteFail = !parcel.WriteUint32(miniWidthOfMainWindow_) || + !parcel.WriteUint32(miniHeightOfMainWindow_) || !parcel.WriteUint32(miniWidthOfSubWindow_) || + !parcel.WriteUint32(miniHeightOfSubWindow_) || !parcel.WriteUint32(miniWidthOfDialogWindow_) || + !parcel.WriteUint32(miniHeightOfDialogWindow_); + if (parcelWriteFail) { return false; } diff --git a/window_scene/test/dms_unittest/screen_session_test.cpp b/window_scene/test/dms_unittest/screen_session_test.cpp index 9d96691c34e08ffdfd2858c802d70db67b568c1b..8ec39694bdac32726649a63eda6ee423891f50ce 100644 --- a/window_scene/test/dms_unittest/screen_session_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_test.cpp @@ -1110,7 +1110,7 @@ HWTEST_F(ScreenSessionTest, Resize002, TestSize.Level1) ASSERT_NE(nullptr, screenSession); uint32_t width = 1000; uint32_t height = 1000; - screenSession->Resize(width, height, false); + screenSession->Resize(width, height); GTEST_LOG_(INFO) << "Resize002 end"; } diff --git a/window_scene/test/mock/mock_session.h b/window_scene/test/mock/mock_session.h index 7c745e22fb8712e984cd2d693d9792cdd8ea7ea0..b22c90c2a2fce120cdc489277e1db3ec20b991a0 100644 --- a/window_scene/test/mock/mock_session.h +++ b/window_scene/test/mock/mock_session.h @@ -69,10 +69,7 @@ public: MOCK_METHOD1(TransferExtensionData, int32_t(const AAFwk::WantParams& wantParams)); MOCK_METHOD1(RaiseMainWindowAboveTarget, WSError(int32_t targetId)); MOCK_METHOD(WSError, ProcessPointDownSession, (int32_t x, int32_t y), (override)); - void SetMockLayoutController(const sptr& layoutController) - { - layoutController_ = layoutController; - } + MOCK_CONST_METHOD2(ConvertGlobalRectToRelative, WSRect(const WSRect& globalRect, DisplayId targetDisplayId)); }; } // namespace Rosen } // namespace OHOS diff --git a/window_scene/test/unittest/layout/scene_session_layout_test.cpp b/window_scene/test/unittest/layout/scene_session_layout_test.cpp index 16b5822b0ab7d3817bbaa02825049975f7b71a27..387dcd965cb7983a170d7dd34e876bcd4150967f 100644 --- a/window_scene/test/unittest/layout/scene_session_layout_test.cpp +++ b/window_scene/test/unittest/layout/scene_session_layout_test.cpp @@ -59,7 +59,7 @@ void SceneSessionLayoutTest::SetUp() void SceneSessionLayoutTest::TearDown() {} -RSSurfaceNode::SharedPtr MainSessionLayoutTest::CreateRSSurfaceNode() +RSSurfaceNode::SharedPtr SceneSessionLayoutTest::CreateRSSurfaceNode() { struct RSSurfaceNodeConfig rsSurfaceNodeConfig; rsSurfaceNodeConfig.SurfaceNodeName = "WindowSessionTestSurfaceNode"; diff --git a/wm/include/window_extension_session_impl.h b/wm/include/window_extension_session_impl.h index e133beaf0bdd46428e29cc31954aafafa6b19c72..7f52a1ea2477a2f9df93c96bd1265cf6be061be9 100644 --- a/wm/include/window_extension_session_impl.h +++ b/wm/include/window_extension_session_impl.h @@ -42,7 +42,7 @@ public: bool isModuleAbilityHookEnd = false) override; WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - WMError Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig = {}) override; + WMError Resize(uint32_t width, uint32_t height) override; WMError TransferAbilityResult(uint32_t resultCode, const AAFwk::Want& want) override; WMError TransferExtensionData(const AAFwk::WantParams& wantParams) override; WSError NotifyTransferComponentData(const AAFwk::WantParams& wantParams) override; diff --git a/wm/include/window_impl.h b/wm/include/window_impl.h index f9a3295f69a8137b63569fad4e2243899c257704..0c4f0abdbf7b8d15d7a873dc770d832b7ac2af1f 100644 --- a/wm/include/window_impl.h +++ b/wm/include/window_impl.h @@ -194,8 +194,7 @@ public: virtual WMError Hide(uint32_t reason, bool withAnimation, bool isFromInnerkits, bool waitDetach) override; virtual WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false, MoveConfiguration moveConfiguration = {}) override; - virtual WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + virtual WMError Resize(uint32_t width, uint32_t height) override; float GetVirtualPixelRatio() override; virtual WMError SetWindowGravity(WindowGravity gravity, uint32_t percent) override; virtual WMError SetKeepScreenOn(bool keepScreenOn) override; diff --git a/wm/include/window_scene_session_impl.h b/wm/include/window_scene_session_impl.h index 16a6b36097043d9b1bac3b60f562c063867f314b..d5c516065462dfa67e12c1d26f39de2e9b443aea 100644 --- a/wm/include/window_scene_session_impl.h +++ b/wm/include/window_scene_session_impl.h @@ -58,10 +58,8 @@ public: WMError MoveWindowToGlobal(int32_t x, int32_t y, MoveConfiguration moveConfiguration = {}) override; WMError MoveWindowToGlobalDisplay(int32_t x, int32_t y, MoveConfiguration moveConfiguration = {}) override; WMError GetGlobalScaledRect(Rect& globalScaledRect) override; - WMError Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; - WMError ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig = {}) override; + WMError Resize(uint32_t width, uint32_t height) override; + WMError ResizeAsync(uint32_t width, uint32_t height) override; WMError SetWindowAnchorInfo(const WindowAnchorInfo& windowAnchorInfo) override; WMError SetFollowParentWindowLayoutEnabled(bool isFollow) override; WSError NotifyLayoutFinishAfterWindowModeChange(WindowMode mode) override; diff --git a/wm/src/window_extension_session_impl.cpp b/wm/src/window_extension_session_impl.cpp index f85e966af27b39a1227bae2290a9aa4d0d30f5e9..91be04e7949bc573428d03c08173ada6c50b6ea4 100644 --- a/wm/src/window_extension_session_impl.cpp +++ b/wm/src/window_extension_session_impl.cpp @@ -335,8 +335,7 @@ WMError WindowExtensionSessionImpl::MoveTo(int32_t x, int32_t y, return static_cast(error); } -WMError WindowExtensionSessionImpl::Resize(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig) +WMError WindowExtensionSessionImpl::Resize(uint32_t width, uint32_t height) { WLOGFD("Id:%{public}d wh %{public}u %{public}u", property_->GetPersistentId(), width, height); if (IsWindowSessionInvalid()) { diff --git a/wm/src/window_impl.cpp b/wm/src/window_impl.cpp index 72ed14ee176f49548a473a884c74ef84f7bd1822..6fbb6eed9ace5083f18d7a654fb5358470fe6450 100644 --- a/wm/src/window_impl.cpp +++ b/wm/src/window_impl.cpp @@ -2020,7 +2020,7 @@ WMError WindowImpl::MoveTo(int32_t x, int32_t y, bool isMoveToGlobal, MoveConfig return UpdateProperty(PropertyChangeAction::ACTION_UPDATE_RECT); } -WMError WindowImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowImpl::Resize(uint32_t width, uint32_t height) { WLOGFD("id:%{public}d Resize %{public}u %{public}u", property_->GetWindowId(), width, height); diff --git a/wm/src/window_scene.cpp b/wm/src/window_scene.cpp index 145d3d7cb04ee9c9523595546e0981569c966bfe..d7529c7056a81f6c27ff9d1d6a434b694043dfca 100644 --- a/wm/src/window_scene.cpp +++ b/wm/src/window_scene.cpp @@ -100,10 +100,9 @@ WMError WindowScene::Init(DisplayId displayId, const std::shared_ptrSetBundleName(context->GetBundleName()); std::string moduleName = context->GetHapModuleInfo() ? context->GetHapModuleInfo()->moduleName : ""; - if (!moduleName.empty()) { - isModuleAbilityHookEnd = - SingletonContainer::Get().IsModuleHookOff(isModuleAbilityHookEnd, moduleName); - } + TLOGI(WmsLogTag::WMS_MAIN, "set isModuleAbiltityHookEnd"); + isModuleAbilityHookEnd = + SingletonContainer::Get().IsModuleHookOff(isModuleAbilityHookEnd, moduleName); } auto mainWindow = SingletonContainer::Get() .CreateWindow(option, context, iSession, identityToken, isModuleAbilityHookEnd); diff --git a/wm/src/window_scene_session_impl.cpp b/wm/src/window_scene_session_impl.cpp index 246f0c0d4b666b109efc100f0b5aac7ea0090a88..518573c4a6825e50b5de4bfa1baf093475f3047a 100644 --- a/wm/src/window_scene_session_impl.cpp +++ b/wm/src/window_scene_session_impl.cpp @@ -2406,7 +2406,7 @@ WMError WindowSceneSessionImpl::CheckAndModifyWindowRect(uint32_t& width, uint32 } /** @note @window.layout */ -WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height, const RectAnimationConfig& rectAnimationConfig) +WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height) { auto reason = SizeChangeReason::RESIZE; if (isResizedByLimit_) { @@ -2440,21 +2440,16 @@ WMError WindowSceneSessionImpl::Resize(uint32_t width, uint32_t height, const Re windowRect.ToString().c_str(), newRect.ToString().c_str()); property_->SetRequestRect(newRect); - property_->SetRectAnimationConfig(rectAnimationConfig); WSRect wsRect = { newRect.posX_, newRect.posY_, newRect.width_, newRect.height_ }; auto hostSession = GetHostSession(); - if (rectAnimationConfig.duration > 0 && reason == SizeChangeReason::RESIZE) { - reason = SizeChangeReason::RESIZE_WITH_ANIMATION; - } CHECK_HOST_SESSION_RETURN_ERROR_IF_NULL(hostSession, WMError::WM_ERROR_INVALID_WINDOW); - auto ret = hostSession->UpdateSessionRect(wsRect, reason, false, false, {}, rectAnimationConfig); + auto ret = hostSession->UpdateSessionRect(wsRect, reason); return static_cast(ret); } -WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height, - const RectAnimationConfig& rectAnimationConfig) +WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height) { if (IsWindowSessionInvalid()) { TLOGE(WmsLogTag::WMS_LAYOUT, "Session is invalid"); @@ -2466,7 +2461,7 @@ WMError WindowSceneSessionImpl::ResizeAsync(uint32_t width, uint32_t height, GetWindowId(), GetWindowMode()); return WMError::WM_ERROR_INVALID_OP_IN_CUR_STATUS; } - auto ret = Resize(width, height, rectAnimationConfig); + auto ret = Resize(width, height); if (state_ == WindowState::STATE_SHOWN) { layoutCallback_->ResetResizeLock(); auto startTime = std::chrono::duration_cast( diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index 23b760198ff7c8f4eaa153e03f3d624d6af4a415..10fa670d7b036e73577e822f5bcb439efb0d5ee7 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2224,7 +2224,7 @@ WMError WindowSessionImpl::SetUIContentInner(const std::string& contentInfo, voi return initUIContentRet; } if (auto uiContent = GetUIContentSharedPtr()) { - TLOGI(WmsLogTag::WMS_LAYOUT, "id:%{public}d, posX:%{public}d, posY:%{public}d, " + TLOGI(WmsLogTag::WMS_LAYOUT, "single hand, id:%{public}d, posX:%{public}d, posY:%{public}d, " "scaleX:%{public}f, scaleY:%{public}f", GetPersistentId(), singleHandTransform_.posX, singleHandTransform_.posY, singleHandTransform_.scaleX, singleHandTransform_.scaleY);