From 16e57001e2de6d6a09e076324d4db0625110a2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E5=AE=87=E8=B1=AA?= <luyuhao6@huawei.com>
Date: Tue, 19 Aug 2025 14:37:55 +0800
Subject: [PATCH] chaneg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 卢宇豪 <luyuhao6@huawei.com>
---
 wm/include/window_scene_session_impl.h |  1 -
 wm/include/window_session_impl.h       |  5 +++++
 wm/src/window_scene_session_impl.cpp   | 15 ---------------
 wm/src/window_session_impl.cpp         | 15 +++++++++++++++
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/wm/include/window_scene_session_impl.h b/wm/include/window_scene_session_impl.h
index 16a6b36097..345b109023 100644
--- a/wm/include/window_scene_session_impl.h
+++ b/wm/include/window_scene_session_impl.h
@@ -450,7 +450,6 @@ private:
      * Window Property
      */
     void InitSystemSessionDragEnable();
-    bool IsSystemDensityChanged(const sptr<DisplayInfo>& displayInfo);
     bool IsDefaultDensityEnabled();
     float GetMainWindowCustomDensity();
     float customDensity_ = UNDEFINED_DENSITY;
diff --git a/wm/include/window_session_impl.h b/wm/include/window_session_impl.h
index 6f578ce4f9..ddbf30830a 100644
--- a/wm/include/window_session_impl.h
+++ b/wm/include/window_session_impl.h
@@ -1095,6 +1095,11 @@ private:
     HookWindowInfo hookWindowInfo_;
     std::atomic_bool notifySizeChangeFlag_ = false;
 
+    /*
+     * Window Property
+     */
+    bool IsSystemDensityChanged(const sptr<DisplayInfo>& displayInfo);
+
     /*
      * Window Decor
      */
diff --git a/wm/src/window_scene_session_impl.cpp b/wm/src/window_scene_session_impl.cpp
index 64154ed9f7..8578003e8c 100644
--- a/wm/src/window_scene_session_impl.cpp
+++ b/wm/src/window_scene_session_impl.cpp
@@ -6140,10 +6140,6 @@ void WindowSceneSessionImpl::NotifyDisplayInfoChange(const sptr<DisplayInfo>& in
         TLOGE(WmsLogTag::DMS, "get display info %{public}" PRIu64 " failed.", displayId);
         return;
     }
-    if (IsSystemDensityChanged(displayInfo)) {
-        lastSystemDensity_ = displayInfo->GetVirtualPixelRatio();
-        NotifySystemDensityChange(displayInfo->GetVirtualPixelRatio());
-    }
     float density = GetVirtualPixelRatio(displayInfo);
     DisplayOrientation orientation = displayInfo->GetDisplayOrientation();
 
@@ -6563,17 +6559,6 @@ WMError WindowSceneSessionImpl::OnContainerModalEvent(const std::string& eventNa
     return WMError::WM_DO_NOTHING;
 }
 
-bool WindowSceneSessionImpl::IsSystemDensityChanged(const sptr<DisplayInfo>& displayInfo)
-{
-    if (MathHelper::NearZero(lastSystemDensity_ - displayInfo->GetVirtualPixelRatio())) {
-        TLOGD(WmsLogTag::WMS_ATTRIBUTE, "System density not change");
-        return false;
-    }
-    TLOGI(WmsLogTag::WMS_ATTRIBUTE, "windowId: %{public}d, lastDensity: %{public}f, currDensity: %{public}f",
-        GetPersistentId(), lastSystemDensity_, displayInfo->GetVirtualPixelRatio());
-    return true;
-}
-
 bool WindowSceneSessionImpl::IsDefaultDensityEnabled()
 {
     if (WindowHelper::IsMainWindow(GetType())) {
diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp
index f40c22ad75..c9018a091d 100644
--- a/wm/src/window_session_impl.cpp
+++ b/wm/src/window_session_impl.cpp
@@ -1775,6 +1775,10 @@ void WindowSessionImpl::UpdateViewportConfig(const Rect& rect, WindowSizeChangeR
     UpdateCurrentWindowOrientation(displayInfo->GetDisplayOrientation());
     int32_t orientation = static_cast<int32_t>(displayInfo->GetDisplayOrientation());
     virtualPixelRatio_ = density;
+    if (IsSystemDensityChanged(displayInfo)) {
+        lastSystemDensity_ = displayInfo->GetVirtualPixelRatio();
+        NotifySystemDensityChange(displayInfo->GetVirtualPixelRatio());
+    }
     auto config = FillViewportConfig(rect, density, orientation, transformHint, GetDisplayId());
     if (reason == WindowSizeChangeReason::DRAG_END && keyFramePolicy_.stopping_) {
         TLOGI(WmsLogTag::WMS_LAYOUT, "key frame stop");
@@ -1811,6 +1815,17 @@ void WindowSessionImpl::UpdateViewportConfig(const Rect& rect, WindowSizeChangeR
     }
 }
 
+bool WindowSessionImpl::IsSystemDensityChanged(const sptr<DisplayInfo>& displayInfo)
+{
+    if (MathHelper::NearZero(lastSystemDensity_ - displayInfo->GetVirtualPixelRatio())) {
+        TLOGD(WmsLogTag::WMS_ATTRIBUTE, "System density not change");
+        return false;
+    }
+    TLOGI(WmsLogTag::WMS_ATTRIBUTE, "windowId: %{public}d, lastDensity: %{public}f, currDensity: %{public}f",
+        GetPersistentId(), lastSystemDensity_, displayInfo->GetVirtualPixelRatio());
+    return true;
+}
+
 int32_t WindowSessionImpl::GetFloatingWindowParentId()
 {
     auto context = GetContext();
-- 
Gitee