[NO MERGE] test draft patch for AuxiliraryMessage event

Change-Id: Idfe8f930ab7c6163d02ebc7c2da22df6951350d8

diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp
index 09f070c570a581798bb402d131584422cb817734..5afa73cfaf0ca662ba12b0feb777c0b1d5930263 100644 (file)
--- 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 321b2948e5f1e36f3e13186a4d417297a068177e..8b3459afe1b287c733498b368f76f364c5141223 100644 (file)
--- a/dali/devel-api/adaptor-framework/window-devel.h
+++ b/dali/devel-api/adaptor-framework/window-devel.h
@@ -49,6 +49,11 @@ typedef Signal<void(Window, WindowEffectState, WindowEffectType)> TransitionEffe
 
 typedef Signal<void()> KeyboardRepeatSettingsChangedSignalType; ///< Keyboard repeat settings changed signal type
 
+//test 
+typedef Signal<void(Window, Dali::Property::Array&)> 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 cd060f0adb786bcf6c6c11a1f2a0434d2230a84d..e3c4ad4ff38297022ab29d774cf821f999bb5780 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -44,6 +44,10 @@
 #include <dali/internal/window-system/common/window-system.h>
 #include <dali/internal/window-system/common/window-visibility-observer.h>
 
+
+//test
+#include <dali/integration-api/debug.h>
+
 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 ef258cb539045e677858e879b622487ba58388e2..536ba6768035d6203f740b6ab8f20866da258faa 100644 (file)
--- 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<void()>                                             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