diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 015c9b9fda68a8614ecd226c319de5fe140f6af0..0b8b6bba847536a3c9b295390304c00c45a1ed96 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -1041,8 +1041,7 @@ void SceneSession::GetSystemAvoidArea(WSRect& rect, AvoidArea& avoidArea) if (Session::GetFloatingScale() <= miniScale) { return; } - if (Session::GetWindowMode() == WindowMode::WINDOW_MODE_FLOATING && - rect.height_ < rect.width_) { + if (Session::GetWindowMode() == WindowMode::WINDOW_MODE_FLOATING && rect.height_ < rect.width_) { return; } float vpr = 3.5f; // 3.5f: default pixel ratio @@ -1071,6 +1070,8 @@ void SceneSession::GetSystemAvoidArea(WSRect& rect, AvoidArea& avoidArea) continue; } WSRect statusBarRect = statusBar->GetSessionRect(); + TLOGI(WmsLogTag::WMS_IMMS, "window rect %{public}s, status bar rect %{public}s", + rect.ToString().c_str(), statusBarRect.ToString().c_str()); CalculateAvoidAreaRect(rect, statusBarRect, avoidArea); } @@ -1110,9 +1111,13 @@ void SceneSession::GetKeyboardAvoidArea(WSRect& rect, AvoidArea& avoidArea) if (inputMethod && inputMethod->GetKeyboardPanelSession()) { keyboardRect = inputMethod->GetKeyboardPanelSession()->GetSessionRect(); } + TLOGI(WmsLogTag::WMS_IMMS, "window rect %{public}s, keyboard rect %{public}s", + rect.ToString().c_str(), keyboardRect.ToString().c_str()); CalculateAvoidAreaRect(rect, keyboardRect, avoidArea); } else { WSRect inputMethodRect = inputMethod->GetSessionRect(); + TLOGI(WmsLogTag::WMS_IMMS, "window rect %{public}s, input method bar rect %{public}s", + rect.ToString().c_str(), inputMethodRect.ToString().c_str()); CalculateAvoidAreaRect(rect, inputMethodRect, avoidArea); } } @@ -1144,6 +1149,8 @@ void SceneSession::GetCutoutAvoidArea(WSRect& rect, AvoidArea& avoidArea) cutoutArea.width_, cutoutArea.height_ }; + TLOGI(WmsLogTag::WMS_IMMS, "window rect %{public}s, cutout area rect %{public}s", + rect.ToString().c_str(), cutoutAreaRect.ToString().c_str()); CalculateAvoidAreaRect(rect, cutoutAreaRect, avoidArea); } @@ -1169,6 +1176,8 @@ void SceneSession::GetAINavigationBarArea(WSRect rect, AvoidArea& avoidArea) if (specificCallback_ != nullptr && specificCallback_->onGetAINavigationBarArea_) { barArea = specificCallback_->onGetAINavigationBarArea_(sessionProperty->GetDisplayId()); } + TLOGI(WmsLogTag::WMS_IMMS, "window rect %{public}s, AI navigation bar rect %{public}s", + rect.ToString().c_str(), barArea.ToString().c_str()); CalculateAvoidAreaRect(rect, barArea, avoidArea); } @@ -1323,7 +1332,6 @@ AvoidArea SceneSession::GetAvoidAreaByType(AvoidAreaType type) AvoidArea avoidArea; WSRect rect = session->GetSessionRect(); - TLOGD(WmsLogTag::WMS_IMMS, "GetAvoidAreaByType type:%{public}u", type); switch (type) { case AvoidAreaType::TYPE_SYSTEM: { session->GetSystemAvoidArea(rect, avoidArea); diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index 0444d1d26336225de627dcea74e442a5d9d6b7d5..f40d16c226b4c4082a638508f81543e53413ff2e 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -2493,11 +2493,11 @@ EnableIfSame& avoidArea, AvoidAreaType type) { TLOGI(WmsLogTag::WMS_IMMS, - "id:%{public}d, type:%{public}d, top{%{public}d,%{public}d,%{public}d,%{public}d}, " - "down{%{public}d,%{public}d,%{public}d,%{public}d}", GetPersistentId(), type, - avoidArea->topRect_.posX_, avoidArea->topRect_.posY_, avoidArea->topRect_.width_, avoidArea->topRect_.height_, - avoidArea->bottomRect_.posX_, avoidArea->bottomRect_.posY_, avoidArea->bottomRect_.width_, - avoidArea->bottomRect_.height_); + "id: %{public}d, type: %{public}d, " + "top %{public}s, bottom %{public}s, left %{public}s, right %{public}s", + GetPersistentId(), type, + avoidArea->topRect_.ToString().c_str(), avoidArea->bottomRect_.ToString().c_str(), + avoidArea->leftRect_.ToString().c_str(), avoidArea->rightRect_.ToString().c_str()); std::lock_guard lockListener(avoidAreaChangeListenerMutex_); auto avoidAreaChangeListeners = GetListeners(); for (auto& listener : avoidAreaChangeListeners) {