From 7e605695c9e1c9f563b068ac670b825310b18419 Mon Sep 17 00:00:00 2001 From: huangji731 Date: Sat, 27 Jan 2024 11:47:53 +0800 Subject: [PATCH] https://gitee.com/openharmony/window_window_manager/issues/I8ZBWM Signed-off-by: huangji731 --- dm/src/display_manager.cpp | 2 +- interfaces/innerkits/dm/display_manager.h | 8 ++++---- interfaces/innerkits/dm/screen.h | 2 +- interfaces/innerkits/dm/screen_manager.h | 2 +- .../innerkits/dm_lite/display_manager_lite.h | 2 +- .../fold_screen_state_machine.h | 5 ++--- .../src/screen_cutout_controller.cpp | 6 +++--- .../session_manager/src/screen_session_manager.cpp | 14 +++++++------- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dm/src/display_manager.cpp b/dm/src/display_manager.cpp index 6ad1e8bf94..f9d6092606 100644 --- a/dm/src/display_manager.cpp +++ b/dm/src/display_manager.cpp @@ -621,7 +621,7 @@ std::vector> DisplayManager::GetAllDisplays() WLOGFD("GetAllDisplays start"); std::vector> res; auto displayIds = GetAllDisplayIds(); - for (auto displayId: displayIds) { + for (auto displayId : displayIds) { const sptr display = GetDisplayById(displayId); if (display != nullptr) { res.emplace_back(display); diff --git a/interfaces/innerkits/dm/display_manager.h b/interfaces/innerkits/dm/display_manager.h index 51830148c7..a52782ece4 100644 --- a/interfaces/innerkits/dm/display_manager.h +++ b/interfaces/innerkits/dm/display_manager.h @@ -279,7 +279,7 @@ public: bool Unfreeze(std::vector displayIds); /** - * @brief Resgister a display listener. + * @brief Register a display listener. * * @param listener IDisplayListener. * @return DM_OK means register success, others means register failed. @@ -303,7 +303,7 @@ public: DMError RegisterDisplayPowerEventListener(sptr listener); /** - * @brief Unregiste an existed listener for display power events. + * @brief Unregister an existed listener for display power events. * * @param listener IDisplayPowerEventListener. * @return DM_OK means unregister success, others means unregister failed. @@ -375,7 +375,7 @@ public: DMError UnregisterDisplayUpdateListener(sptr listener); /** - * @brief Register a listener for the event of dispaly mode changed. + * @brief Register a listener for the event of display mode changed. * * @param listener IDisplayModeListener. * @return DM_OK means register success, others means register failed. @@ -383,7 +383,7 @@ public: DMError RegisterDisplayModeListener(sptr listener); /** - * @brief Unregister an existed listener for the event of dispaly mode changed. + * @brief Unregister an existed listener for the event of display mode changed. * * @param listener IDisplayModeListener. * @return DM_OK means unregister success, others means unregister failed. diff --git a/interfaces/innerkits/dm/screen.h b/interfaces/innerkits/dm/screen.h index d33a9f6c4e..c27f913902 100644 --- a/interfaces/innerkits/dm/screen.h +++ b/interfaces/innerkits/dm/screen.h @@ -137,7 +137,7 @@ public: /** * @brief Set screen active mode. * - * @param moddId Mode id. + * @param modeId Mode id. * @return DM_OK means set success, others means set failed. */ DMError SetScreenActiveMode(uint32_t modeId); diff --git a/interfaces/innerkits/dm/screen_manager.h b/interfaces/innerkits/dm/screen_manager.h index 47d93dc094..6acf7a1f43 100644 --- a/interfaces/innerkits/dm/screen_manager.h +++ b/interfaces/innerkits/dm/screen_manager.h @@ -235,7 +235,7 @@ public: /** * @brief Set screen rotation lock status. * - * @param isLocked True means forbide to rotate screen, false means the opposite. + * @param isLocked True means forbid to rotate screen, false means the opposite. * @return DM_OK means set success, others means set failed. */ DMError SetScreenRotationLocked(bool isLocked); diff --git a/interfaces/innerkits/dm_lite/display_manager_lite.h b/interfaces/innerkits/dm_lite/display_manager_lite.h index 2d3945d9fa..f4ca662ef6 100644 --- a/interfaces/innerkits/dm_lite/display_manager_lite.h +++ b/interfaces/innerkits/dm_lite/display_manager_lite.h @@ -58,7 +58,7 @@ public: }; /** - * @brief Resgister a display listener. + * @brief Register a display listener. * * @param listener IDisplayListener. * @return DM_OK means register success, others means register failed. diff --git a/window_scene/session_manager/include/fold_screen_controller/fold_screen_state_machine.h b/window_scene/session_manager/include/fold_screen_controller/fold_screen_state_machine.h index 517e7aa594..087622fa98 100644 --- a/window_scene/session_manager/include/fold_screen_controller/fold_screen_state_machine.h +++ b/window_scene/session_manager/include/fold_screen_controller/fold_screen_state_machine.h @@ -38,12 +38,11 @@ class TransitionCallback { public: ~TransitionCallback() = default; - virtual void OnTransitionEnter(FoldScreenState current, FoldScreenState next) { }; + virtual void OnTransitionEnter(FoldScreenState current, FoldScreenState next) { } - virtual void OnTransitionExit(FoldScreenState previous, FoldScreenState current) { }; + virtual void OnTransitionExit(FoldScreenState previous, FoldScreenState current) { } }; - class FoldScreenStateMachine : public RefBase { public: FoldScreenStateMachine(); diff --git a/window_scene/session_manager/src/screen_cutout_controller.cpp b/window_scene/session_manager/src/screen_cutout_controller.cpp index 05be13826e..158d84a627 100644 --- a/window_scene/session_manager/src/screen_cutout_controller.cpp +++ b/window_scene/session_manager/src/screen_cutout_controller.cpp @@ -51,7 +51,7 @@ void ScreenCutoutController::ConvertBoundaryRectsByRotation(std::vector& std::vector finalVector; sptr displayInfo = ScreenSessionManager::GetInstance().GetDisplayInfoById(displayId); if (!displayInfo) { - WLOGFE("displayInfo invaild"); + WLOGFE("displayInfo invalid"); boundaryRects = finalVector; return; } @@ -106,7 +106,7 @@ void ScreenCutoutController::ConvertBoundaryRectsByRotation(std::vector& void ScreenCutoutController::CheckBoundaryRects(std::vector& boundaryRects, sptr displayInfo) { if (!displayInfo) { - WLOGFE("displayInfo invaild"); + WLOGFE("displayInfo invalid"); return; } @@ -156,7 +156,7 @@ void ScreenCutoutController::CalcWaterfallRects(DisplayId displayId) sptr displayInfo = ScreenSessionManager::GetInstance().GetDisplayInfoById(displayId); if (!displayInfo) { - WLOGFE("displayInfo invaild"); + WLOGFE("displayInfo invalid"); return; } diff --git a/window_scene/session_manager/src/screen_session_manager.cpp b/window_scene/session_manager/src/screen_session_manager.cpp index d5f14903e6..5c9a7882c8 100644 --- a/window_scene/session_manager/src/screen_session_manager.cpp +++ b/window_scene/session_manager/src/screen_session_manager.cpp @@ -1091,7 +1091,7 @@ void ScreenSessionManager::NotifyDisplayEvent(DisplayEvent event) ScreenPowerState ScreenSessionManager::GetScreenPower(ScreenId screenId) { auto state = static_cast(RSInterfaces::GetInstance().GetScreenPowerStatus(screenId)); - WLOGFI("GetScreenPower:%{public}u, rsscreen:%{public}" PRIu64".", state, screenId); + WLOGFI("GetScreenPower:%{public}u, screenId:%{public}" PRIu64".", state, screenId); return state; } @@ -1357,7 +1357,7 @@ DMError ScreenSessionManager::GetAllScreenInfos(std::vector>& s return DMError::DM_ERROR_NOT_SYSTEM_APP; } std::vector screenIds = GetAllScreenIds(); - for (auto screenId: screenIds) { + for (auto screenId : screenIds) { auto screenInfo = GetScreenInfoById(screenId); if (screenInfo == nullptr) { WLOGE("SCB: ScreenSessionManager::GetAllScreenInfos cannot find screenInfo: %{public}" PRIu64"", screenId); @@ -1534,7 +1534,7 @@ ScreenId ScreenSessionManager::CreateVirtualScreen(VirtualScreenOption option, smsScreenId = screenIdManager_.CreateAndGetNewScreenId(rsId); auto screenSession = InitVirtualScreen(smsScreenId, rsId, option); if (screenSession == nullptr) { - WLOGFI("SCB: ScreenSessionManager::CreateVirtualScreen screensession is nullptr"); + WLOGFI("SCB: ScreenSessionManager::CreateVirtualScreen screenSession is nullptr"); screenIdManager_.DeleteScreenId(smsScreenId); return SCREEN_ID_INVALID; } @@ -2929,7 +2929,7 @@ void ScreenSessionManager::NotifyFoldStatusChanged(FoldStatus foldStatus) if (agents.empty()) { return; } - for (auto& agent: agents) { + for (auto& agent : agents) { agent->NotifyFoldStatusChanged(foldStatus); } } @@ -2940,7 +2940,7 @@ void ScreenSessionManager::NotifyDisplayChangeInfoChanged(const sptrNotifyDisplayChangeInfoChanged(info); } } @@ -2952,7 +2952,7 @@ void ScreenSessionManager::NotifyDisplayModeChanged(FoldDisplayMode displayMode) if (agents.empty()) { return; } - for (auto& agent: agents) { + for (auto& agent : agents) { agent->NotifyDisplayModeChanged(displayMode); } } @@ -3257,7 +3257,7 @@ void ScreenSessionManager::NotifyAvailableAreaChanged(DMRect area) if (agents.empty()) { return; } - for (auto& agent: agents) { + for (auto& agent : agents) { agent->NotifyAvailableAreaChanged(area); } } -- Gitee