From 9e65c51d4d704ecd3c7d32916811a7aade8478f1 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Thu, 18 Nov 2021 17:28:37 +0900 Subject: [PATCH] [NO MERGE] test draft patch for AuxiliraryMessage event Change-Id: Idfe8f930ab7c6163d02ebc7c2da22df6951350d8 --- .../adaptor-framework/window-devel.cpp | 8 ++++ .../adaptor-framework/window-devel.h | 10 ++++ .../window-system/common/window-impl.cpp | 46 +++++++++++++++++++ .../window-system/common/window-impl.h | 15 ++++++ 4 files changed, 79 insertions(+) diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index 09f070c57..5afa73cfa 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -101,6 +101,14 @@ KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal(Win return GetImplementation(window).KeyboardRepeatSettingsChangedSignal(); } +//test +AuxiliraryMessageSignalType& AuxiliraryMessageSignal(Window window) +{ + return GetImplementation(window).AuxiliraryMessageSignal(); +} + + + void SetParent(Window window, Window parent) { GetImplementation(window).SetParent(parent); diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 321b2948e..8b3459afe 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -49,6 +49,11 @@ typedef Signal TransitionEffe typedef Signal KeyboardRepeatSettingsChangedSignalType; ///< Keyboard repeat settings changed signal type +//test +typedef Signal AuxiliraryMessageSignalType; + + + /** * @brief Creates an initialized handle to a new Window. * @@ -145,6 +150,11 @@ DALI_ADAPTOR_API TransitionEffectEventSignalType& TransitionEffectEventSignal(Wi */ DALI_ADAPTOR_API KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal(Window window); +//test +DALI_ADAPTOR_API AuxiliraryMessageSignalType& AuxiliraryMessageSignal(Window window); + + + /** * @brief Sets parent window of the window. * diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index cd060f0ad..e3c4ad4ff 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -44,6 +44,10 @@ #include #include + +//test +#include + namespace Dali { namespace Internal @@ -93,6 +97,9 @@ Window::Window() mVisibilityChangedSignal(), mTransitionEffectEventSignal(), mKeyboardRepeatSettingsChangedSignal() + + //test + ,mAuxiliraryMessageSignal() { } @@ -440,6 +447,15 @@ void Window::Show() WindowVisibilityObserver* observer(mAdaptor); observer->OnWindowShown(); + + //test. + Dali::Property::Array array; + array.Add("key1"); + array.Add("val1"); + array.Add("opt1-1"); + array.Add("opt1-2"); + mAuxiliraryMessageSignal.Emit(handle, array); + DALI_LOG_ERROR("@@ TEST-1"); } mSurface->SetFullSwapNextFrame(); @@ -460,6 +476,17 @@ void Window::Hide() WindowVisibilityObserver* observer(mAdaptor); observer->OnWindowHidden(); + + + //test. + Dali::Property::Array array; + array.Add("key2"); + array.Add("val2"); + array.Add("opt2-1"); + array.Add("opt2-2"); + mAuxiliraryMessageSignal.Emit(handle, array); + DALI_LOG_ERROR("@@ TEST-2"); + } DALI_LOG_RELEASE_INFO("Window (%p), WinId (%d), Hide(): iconified = %d, visible = %d\n", this, mNativeWindowId, mIconified, mVisible); @@ -720,6 +747,16 @@ void Window::OnIconifyChanged(bool iconified) WindowVisibilityObserver* observer(mAdaptor); observer->OnWindowHidden(); + + + //test. + Dali::Property::Array array; + array.Add("key3"); + array.Add("val3"); + array.Add("opt3-1"); + array.Add("opt3-2"); + mAuxiliraryMessageSignal.Emit(handle, array); + DALI_LOG_ERROR("@@ TEST-3"); } DALI_LOG_RELEASE_INFO("Window (%p), WinId (%d), Iconified: visible = %d\n", this, mNativeWindowId, mVisible); @@ -735,6 +772,15 @@ void Window::OnIconifyChanged(bool iconified) WindowVisibilityObserver* observer(mAdaptor); observer->OnWindowShown(); + + //test. + Dali::Property::Array array; + array.Add("key4"); + array.Add("val4"); + array.Add("opt4-1"); + array.Add("opt4-2"); + mAuxiliraryMessageSignal.Emit(handle, array); + DALI_LOG_ERROR("@@ TEST-4"); } DALI_LOG_RELEASE_INFO("Window (%p), WinId (%d), Deiconified: visible = %d\n", this, mNativeWindowId, mVisible); diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index ef258cb53..536ba6768 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -66,6 +66,9 @@ public: typedef Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType KeyboardRepeatSettingsChangedSignalType; typedef Signal SignalType; +//test. + typedef Dali::DevelWindow::AuxiliraryMessageSignalType AuxiliraryMessageSignalType; + /** * @brief Create a new Window. This should only be called once by the Application class * @param[in] positionSize The position and size of the window @@ -625,6 +628,15 @@ public: // Signals return mKeyboardRepeatSettingsChangedSignal; } + +//test + AuxiliraryMessageSignalType& AuxiliraryMessageSignal() + { + return mAuxiliraryMessageSignal; + } + + + private: WindowRenderSurface* mWindowSurface; ///< The window rendering surface WindowBase* mWindowBase; @@ -658,6 +670,9 @@ private: VisibilityChangedSignalType mVisibilityChangedSignal; TransitionEffectEventSignalType mTransitionEffectEventSignal; KeyboardRepeatSettingsChangedSignalType mKeyboardRepeatSettingsChangedSignal; + +//test + AuxiliraryMessageSignalType mAuxiliraryMessageSignal; }; } // namespace Adaptor -- 2.34.1