From e72a5135b20dcfe2c39387eb98032eaf0614032c Mon Sep 17 00:00:00 2001
From: xingyanan <xingyanan2@huawei.com>
Date: Wed, 6 Jul 2022 11:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=82=E5=8F=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xingyanan <xingyanan2@huawei.com>
Change-Id: Ic62458b02b8d8e0f6f1d215f0e3c6df22ac170a9
Signed-off-by: xingyanan <xingyanan2@huawei.com>
---
 dm/test/systemtest/display_power_test.cpp     | 13 -----
 dm/test/systemtest/screen_manager_test.cpp    | 50 -------------------
 wmserver/src/window_layout_policy_cascade.cpp |  3 +-
 3 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/dm/test/systemtest/display_power_test.cpp b/dm/test/systemtest/display_power_test.cpp
index 54c29739..6c1553d3 100644
--- a/dm/test/systemtest/display_power_test.cpp
+++ b/dm/test/systemtest/display_power_test.cpp
@@ -409,19 +409,6 @@ HWTEST_F(DisplayPowerTest, set_screen_brightness_001, Function | MediumTest | Le
     ASSERT_EQ(level, brightnessLevel_);
 }
 
-/**
-* @tc.name: set_screen_brightness_002
-* @tc.desc: Call SetScreenBrightness with an invalid value and check the GetScreenBrightness return value
-* @tc.type: FUNC
-*/
-HWTEST_F(DisplayPowerTest, set_screen_brightness_002, Function | MediumTest | Level2)
-{
-    bool ret = DisplayManager::GetInstance().SetScreenBrightness(defaultId_, invalidBrightnessLevel_);
-    ASSERT_EQ(true, ret);
-    uint32_t level = DisplayManager::GetInstance().GetScreenBrightness(defaultId_);
-    ASSERT_NE(level, invalidBrightnessLevel_);
-}
-
 /**
 * @tc.name: window_life_cycle_001
 * @tc.desc: Add a window and then call SuspendEnd and check window state; Notify unlock and check window state
diff --git a/dm/test/systemtest/screen_manager_test.cpp b/dm/test/systemtest/screen_manager_test.cpp
index 489a3ee8..04d98fe6 100644
--- a/dm/test/systemtest/screen_manager_test.cpp
+++ b/dm/test/systemtest/screen_manager_test.cpp
@@ -425,56 +425,6 @@ HWTEST_F(ScreenManagerTest, ScreenManager08, Function | MediumTest | Level2)
     ScreenManager::GetInstance().UnregisterScreenGroupListener(screenGroupChangeListener);
 }
 
-/**
- * @tc.name: ScreenManager09
- * @tc.desc: Create a virtual screen as expansion of default screen, create windowNode on virtual screen,
- *           and destroy virtual screen
- * @tc.type: FUNC
- */
-HWTEST_F(ScreenManagerTest, ScreenManager09, Function | MediumTest | Level2)
-{
-    DisplayTestUtils utils;
-    ASSERT_TRUE(utils.CreateSurface());
-    defaultOption_.surface_ = utils.psurface_;
-    defaultOption_.isForShot_ = false;
-    CHECK_TEST_INIT_SCREEN_STATE
-    ScreenId virtualScreenId = ScreenManager::GetInstance().CreateVirtualScreen(defaultOption_);
-    CHECK_SCREEN_STATE_AFTER_CREATE_VIRTUAL_SCREEN
-    CheckScreenStateInGroup(false, group, groupId, virtualScreen, virtualScreenId);
-    sleep(TEST_SLEEP_S);
-    std::vector<ExpandOption> options = {{defaultScreenId_, 0, 0}, {virtualScreenId, defaultWidth_, 0}};
-    ScreenId expansionId = ScreenManager::GetInstance().MakeExpand(options);
-    CheckScreenGroupState(ScreenCombination::SCREEN_EXPAND, ScreenGroupChangeEvent::ADD_TO_GROUP,
-        virtualScreenId, group, screenGroupChangeListener);
-    CheckScreenStateInGroup(true, group, groupId, virtualScreen, virtualScreenId);
-    sleep(TEST_SLEEP_S);
-    ASSERT_NE(SCREEN_ID_INVALID, expansionId);
-    DisplayId virtualDisplayId = DisplayManager::GetInstance().GetDisplayByScreen(virtualScreenId)->GetId();
-    ASSERT_NE(DISPLAY_ID_INVALID, virtualDisplayId);
-    sptr<Window> window = CreateWindowByDisplayId(virtualDisplayId);
-    ASSERT_NE(nullptr, window);
-    sleep(TEST_SLEEP_S);
-    auto surfaceNode = window->GetSurfaceNode();
-    auto rsUiDirector = RSUIDirector::Create();
-    rsUiDirector->Init();
-    RSTransaction::FlushImplicitTransaction();
-    sleep(TEST_SLEEP_S);
-    rsUiDirector->SetRSSurfaceNode(surfaceNode);
-    RootNodeInit(rsUiDirector, 200, 400);
-    rsUiDirector->SendMessages();
-    sleep(TEST_SLEEP_S);
-    ASSERT_EQ(DMError::DM_OK, ScreenManager::GetInstance().DestroyVirtualScreen(virtualScreenId));
-    CHECK_SCREEN_STATE_AFTER_DESTROY_VIRTUAL_SCREEN
-    CheckScreenGroupState(ScreenCombination::SCREEN_EXPAND, ScreenGroupChangeEvent::REMOVE_FROM_GROUP,
-        virtualScreenId, group, screenGroupChangeListener);
-    CheckScreenStateInGroup(false, group, groupId, virtualScreen, virtualScreenId);
-    ScreenManager::GetInstance().UnregisterScreenListener(screenListener);
-    ScreenManager::GetInstance().UnregisterScreenGroupListener(screenGroupChangeListener);
-    sleep(TEST_SLEEP_S);
-    window->Show();
-    sleep(TEST_SLEEP_S_LONG);
-    window->Destroy();
-}
 
 /**
  * @tc.name: ScreenManager10
diff --git a/wmserver/src/window_layout_policy_cascade.cpp b/wmserver/src/window_layout_policy_cascade.cpp
index 4e766fb3..e4fa8dc3 100644
--- a/wmserver/src/window_layout_policy_cascade.cpp
+++ b/wmserver/src/window_layout_policy_cascade.cpp
@@ -515,7 +515,8 @@ Rect WindowLayoutPolicyCascade::GetCurCascadeRect(const sptr<WindowNode>& node)
                 (*iter)->GetWindowId() != node->GetWindowId()) {
                 auto property = (*iter)->GetWindowProperty();
                 if (property != nullptr) {
-                    cascadeRect = property->GetWindowRect();
+                    cascadeRect = ((*iter)->GetWindowMode() == WindowMode::WINDOW_MODE_FLOATING ?
+                        property->GetWindowRect() : property->GetRequestRect());
                 }
                 WLOGFI("Get current cascadeRect: %{public}u [%{public}d, %{public}d, %{public}u, %{public}u]",
                     (*iter)->GetWindowId(), cascadeRect.posX_, cascadeRect.posY_,