From 870a232aaeb821b0554be8db87ea954ce43ce723 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Wed, 5 Apr 2023 11:21:26 +0900 Subject: [PATCH] [Tizen] Add trace log mouse button and wheel Change-Id: I7fae8f90fdaad2b9bd6f2481debc2167eb7fee24 --- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index dc903ee..d535ed5 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -1139,6 +1139,8 @@ void WindowBaseEcoreWl2::OnMouseButtonDown(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_DOWN"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1179,6 +1181,8 @@ void WindowBaseEcoreWl2::OnMouseButtonUp(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_UP"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1206,6 +1210,8 @@ void WindowBaseEcoreWl2::OnMouseButtonMove(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_MOVE"); + Device::Class::Type deviceClass; Device::Subclass::Type deviceSubclass; @@ -1232,6 +1238,8 @@ void WindowBaseEcoreWl2::OnMouseButtonCancel(void* data, int type, void* event) if(touchEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_CANCEL"); + Integration::Point point; point.SetDeviceId(touchEvent->multi.device); point.SetState(PointState::INTERRUPTED); @@ -1249,6 +1257,8 @@ void WindowBaseEcoreWl2::OnMouseWheel(void* data, int type, void* event) if(mouseWheelEvent->window == static_cast(ecore_wl2_window_id_get(mEcoreWindow))) { + DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_MOUSE_WHEEL"); + DALI_LOG_INFO(gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z); Integration::WheelEvent wheelEvent(Integration::WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2(mouseWheelEvent->x, mouseWheelEvent->y), mouseWheelEvent->z, mouseWheelEvent->timestamp); @@ -2070,7 +2080,6 @@ unsigned int WindowBaseEcoreWl2::GetAuxiliaryHintId(const std::string& hint) con return 0; } - Rect WindowBaseEcoreWl2::RecalculateInputRect(const Rect& rect) { Rect newRect; @@ -2925,7 +2934,7 @@ bool WindowBaseEcoreWl2::IsFloatingModeEnabled() const void WindowBaseEcoreWl2::IncludeInputRegion(const Rect& inputRegion) { - Rect convertRegion = RecalculateInputRect(inputRegion); + Rect convertRegion = RecalculateInputRect(inputRegion); Eina_Rectangle rect; rect.x = convertRegion.x; @@ -2940,7 +2949,7 @@ void WindowBaseEcoreWl2::IncludeInputRegion(const Rect& inputRegion) void WindowBaseEcoreWl2::ExcludeInputRegion(const Rect& inputRegion) { - Rect convertRegion = RecalculateInputRect(inputRegion); + Rect convertRegion = RecalculateInputRect(inputRegion); Eina_Rectangle rect; rect.x = convertRegion.x; -- 2.7.4