diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp index 9b6841b675257331b7142c8665ae46a461b9296a..397c32e05ed1e16e037ae73aa99ac1cbb08e625f 100644 --- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp +++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp @@ -640,7 +640,8 @@ void InputManagerImpl::OnPointerEvent(std::shared_ptr pointerEvent pointerEvent->GetPointerAction() != PointerEvent::POINTER_ACTION_ROTATE_UPDATE && pointerEvent->GetPointerAction() != PointerEvent::POINTER_ACTION_PULL_MOVE) { if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE) { - MMI_HILOG_FREEZEI("id:%{public}d recv, BI:%{public}d", pointerEvent->GetId(), pointerEvent->GetButtonId()); + MMI_HILOG_FREEZEI("id:%{public}d recv, BI:%{public}d, PBS:%{public}zu", pointerEvent->GetId(), + pointerEvent->GetButtonId(), pointerEvent->GetPressedButtons().size()); } else { MMI_HILOG_FREEZEI("recv"); } diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp index f5f6394e9f5a2db1a1cf8208f5f299c4d4ba48c7..569b9e6849c7bcfb1871d95617bbf92d8080bf13 100644 --- a/service/window_manager/src/input_windows_manager.cpp +++ b/service/window_manager/src/input_windows_manager.cpp @@ -2604,6 +2604,8 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction, int32_t windowI currentPointerItem.SetPointerId(0); SetPrivacyModeFlag(lastWindowInfo_.privacyMode, pointerEvent); + currentPointerItem.SetPressed(lastPointerItem.IsPressed()); + currentPointerItem.SetTargetWindowId(lastWindowInfo_.id); pointerEvent->SetTargetWindowId(lastWindowInfo_.id); pointerEvent->SetAgentWindowId(lastWindowInfo_.agentWindowId); pointerEvent->SetPointerId(0); @@ -2680,6 +2682,12 @@ void InputWindowsManager::NotifyPointerToWindow(int32_t groupId) lastWindowInfo_ = *windowInfo; return; } + if (MMI_GNE(lastWindowInfo_.zOrder, windowInfo->zOrder)) { + std::string windowPrint; + windowPrint += StringPrintf("highZorder"); + PrintZorderInfo(*windowInfo, windowPrint); + MMI_HILOGD("%{public}s", windowPrint.c_str()); + } bool isFindLastWindow = false; auto &WindowsInfo = GetWindowInfoVector(groupId); for (const auto &item : WindowsInfo) {