From 8462b8e235f84f8bd5c865de17ecd3178237d4ea Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Wed, 23 Aug 2023 16:32:19 +0900 Subject: [PATCH] Add ecore_wl2_window_cursor_visible_set api Sets the visibility on/off of cursor Change-Id: I724d7785d757bcc5428375f0cbe9c96d1289ca72 --- dali/devel-api/adaptor-framework/window-devel.cpp | 5 +++++ dali/devel-api/adaptor-framework/window-devel.h | 8 ++++++++ dali/internal/window-system/android/window-base-android.cpp | 4 ++++ dali/internal/window-system/android/window-base-android.h | 5 +++++ dali/internal/window-system/common/window-base.h | 7 +++++++ dali/internal/window-system/common/window-impl.cpp | 5 +++++ dali/internal/window-system/common/window-impl.h | 5 +++++ dali/internal/window-system/macos/window-base-mac.h | 5 +++++ dali/internal/window-system/macos/window-base-mac.mm | 4 ++++ .../window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h | 5 +++++ .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 5 +++++ .../window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h | 5 +++++ dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp | 4 ++++ dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h | 5 +++++ dali/internal/window-system/windows/window-base-win.cpp | 4 ++++ dali/internal/window-system/windows/window-base-win.h | 5 +++++ dali/internal/window-system/x11/window-base-x.cpp | 4 ++++ dali/internal/window-system/x11/window-base-x.h | 5 +++++ 18 files changed, 90 insertions(+) diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index ef0847e..e5ef80f 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -324,6 +324,11 @@ bool PointerWarp(Window window, int32_t x, int32_t y) return GetImplementation(window).PointerWarp(x, y); } +void CursorVisibleSet(Window window, bool visible) +{ + GetImplementation(window).CursorVisibleSet(visible); +} + InterceptKeyEventSignalType& InterceptKeyEventSignal(Window window) { return GetImplementation(window).InterceptKeyEventSignal(); diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 979fcc7..994ea50 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -584,6 +584,14 @@ DALI_ADAPTOR_API void LockedPointerCursorPositionHintSet(Window window, int32_t DALI_ADAPTOR_API bool PointerWarp(Window window, int32_t x, int32_t y); /** + * @brief Sets visibility on/off of cursor + * + * @param[in] window The window instance. + * @param[in] visible The visibility of cursor + */ +DALI_ADAPTOR_API void CursorVisibleSet(Window window, bool visible); + +/** * @brief The user would connect to this signal to intercept a KeyEvent at window. * * Intercepts KeyEvents in the window before dispatching KeyEvents to the control. diff --git a/dali/internal/window-system/android/window-base-android.cpp b/dali/internal/window-system/android/window-base-android.cpp index 6c975b2..7355b7f 100644 --- a/dali/internal/window-system/android/window-base-android.cpp +++ b/dali/internal/window-system/android/window-base-android.cpp @@ -455,6 +455,10 @@ bool WindowBaseAndroid::PointerWarp(int32_t x, int32_t y) return false; } +void WindowBaseAndroid::CursorVisibleSet(bool visible) +{ +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/android/window-base-android.h b/dali/internal/window-system/android/window-base-android.h index 2978d18..abd3de4 100644 --- a/dali/internal/window-system/android/window-base-android.h +++ b/dali/internal/window-system/android/window-base-android.h @@ -479,6 +479,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization diff --git a/dali/internal/window-system/common/window-base.h b/dali/internal/window-system/common/window-base.h index e058c6d..204fdad 100644 --- a/dali/internal/window-system/common/window-base.h +++ b/dali/internal/window-system/common/window-base.h @@ -506,6 +506,13 @@ public: */ virtual bool PointerWarp(int32_t x, int32_t y) = 0; + /** + * @brief Sets visibility on/off of cursor + * + * @param[in] visible The visibility of cursor + */ + virtual void CursorVisibleSet(bool visible) = 0; + // Signals /** diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index ae3a117..332bbd4 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -1430,6 +1430,11 @@ bool Window::PointerWarp(int32_t x, int32_t y) return mWindowBase->PointerWarp(x, y); } +void Window::CursorVisibleSet(bool visible) +{ + mWindowBase->CursorVisibleSet(visible); +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 8143ba1..2b9b367 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -536,6 +536,11 @@ public: // Dali::Internal::Adaptor::SceneHolder */ bool PointerWarp(int32_t x, int32_t y); + /** + * @copydoc Dali::DevelWindow::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible); + private: /** * @brief Enumeration for orietation mode. diff --git a/dali/internal/window-system/macos/window-base-mac.h b/dali/internal/window-system/macos/window-base-mac.h index 63e77a8..4a3390a 100644 --- a/dali/internal/window-system/macos/window-base-mac.h +++ b/dali/internal/window-system/macos/window-base-mac.h @@ -412,6 +412,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: // Undefined WindowBaseCocoa(const WindowBaseCocoa&) = delete; diff --git a/dali/internal/window-system/macos/window-base-mac.mm b/dali/internal/window-system/macos/window-base-mac.mm index 675370b..43cc053 100644 --- a/dali/internal/window-system/macos/window-base-mac.mm +++ b/dali/internal/window-system/macos/window-base-mac.mm @@ -746,6 +746,10 @@ bool WindowBaseCocoa::PointerWarp(int32_t x, int32_t y) return false; } +void WindowBaseCocoa::CursorVisibleSet(bool visible) +{ +} + } // namespace Dali::Internal::Adaptor @implementation CocoaView diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h index c56dae2..177ea76 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h @@ -534,6 +534,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization 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 0f4e28a..3120694 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 @@ -3408,6 +3408,11 @@ bool WindowBaseEcoreWl2::PointerWarp(int32_t x, int32_t y) return ecore_wl2_window_pointer_warp(mEcoreWindow, x, y); } +void WindowBaseEcoreWl2::CursorVisibleSet(bool visible) +{ + ecore_wl2_window_cursor_visible_set(mEcoreWindow, visible); +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h index 1e6e4f7..7240bff 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h @@ -611,6 +611,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp index c4bce93..e0b6e23 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp @@ -1042,6 +1042,10 @@ bool WindowBaseEcoreX::PointerWarp(int32_t x, int32_t y) return false; } +void WindowBaseEcoreX::CursorVisibleSet(bool visible) +{ +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h index 735e1f7..493a74b 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h @@ -484,6 +484,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp index 056d2a5..7d71d49 100644 --- a/dali/internal/window-system/windows/window-base-win.cpp +++ b/dali/internal/window-system/windows/window-base-win.cpp @@ -677,6 +677,10 @@ bool WindowBaseWin::PointerWarp(int32_t x, int32_t y) return false; } +void WindowBaseWin::CursorVisibleSet(bool visible) +{ +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h index de49e6a..6006907 100644 --- a/dali/internal/window-system/windows/window-base-win.h +++ b/dali/internal/window-system/windows/window-base-win.h @@ -466,6 +466,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization diff --git a/dali/internal/window-system/x11/window-base-x.cpp b/dali/internal/window-system/x11/window-base-x.cpp index bb1743b..7a66fb5 100644 --- a/dali/internal/window-system/x11/window-base-x.cpp +++ b/dali/internal/window-system/x11/window-base-x.cpp @@ -978,6 +978,10 @@ bool WindowBaseX::PointerWarp(int32_t x, int32_t y) return false; } +void WindowBaseX::CursorVisibleSet(bool visible) +{ +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/x11/window-base-x.h b/dali/internal/window-system/x11/window-base-x.h index 34ede13..aa60298 100644 --- a/dali/internal/window-system/x11/window-base-x.h +++ b/dali/internal/window-system/x11/window-base-x.h @@ -488,6 +488,11 @@ public: */ bool PointerWarp(int32_t x, int32_t y) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::CursorVisibleSet() + */ + void CursorVisibleSet(bool visible) override; + private: /** * Second stage initialization -- 2.7.4