X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.h;h=2223215f0c97bd291f5f727894f596aa9178fdf8;hb=0ab03fd31caa2fed67992675e3f2b69cc5b894c5;hp=1afa0a2cb4d02a0d7d85495ebf9e1392784fcb5a;hpb=57974024e1401e657866df3afabf53676a5892b6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index 1afa0a2..2223215 100755
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_DATA_IMPL_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,9 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-resource-observer.h>
+#include <dali-toolkit/internal/visuals/visual-event-observer.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali/devel-api/common/owner-container.h>
-#include <dali-toolkit/devel-api/layouting/layout-item-impl.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/internal/controls/tooltip/tooltip.h>
 #include <dali-toolkit/internal/builder/style.h>
@@ -65,7 +64,7 @@ typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer;
 /**
  * @brief Holds the Implementation for the internal control class
  */
-class Control::Impl : public ConnectionTracker, public Visual::ResourceObserver
+class Control::Impl : public ConnectionTracker, public Visual::EventObserver
 {
 
 public:
@@ -124,9 +123,17 @@ public:
   /**
    * @brief Called when a resource is ready.
    * @param[in] object The visual whose resources are ready
-   * @note Overriding method in Visual::ResourceObserver.
+   * @note Overriding method in Visual::EventObserver.
    */
-  virtual void ResourceReady( Visual::Base& object );
+  virtual void ResourceReady( Visual::Base& object ) override;
+
+  /**
+   * @brief Called when an event occurs.
+   * @param[in] object The visual whose events occur
+   * @param[in] signalId The signal to emit. See Visual to find supported signals
+   * @note Overriding method in Visual::EventObserver.
+   */
+  virtual void NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override;
 
   /**
    * @copydoc Dali::Toolkit::DevelControl::RegisterVisual()
@@ -325,35 +332,9 @@ public:
   bool FilterKeyEvent( const KeyEvent& event );
 
   /**
-   * @brief Get the layout associated with this control, if any.
-   *
-   * @return A pointer to the layout, or NULL.
-   */
-  Toolkit::Internal::LayoutItemPtr GetLayout() const;
-
-  /**
-   * @brief Set the layout on this control.
-   * @param[in] layout Pointer to the layout
-   */
-  void SetLayout( Toolkit::Internal::LayoutItem& layout );
-
-  /**
-   * @brief Remove the layout from this control
-   *
-   * @note This does not remove any children from this control, nor does it strip
-   * layouts from them but it does remove them from the layout hierarchy.
-   */
-  void RemoveLayout();
-
-  /**
-   * @copydoc DevelControl::SetLayoutingRequired
+   * @copydoc DevelControl::VisualEventSignal()
    */
-  void SetLayoutingRequired( bool layoutingRequired );
-
-  /**
-   * @copydoc DevelControl::IsLayoutingRequired()
-   */
-  bool IsLayoutingRequired();
+  DevelControl::VisualEventSignalType& VisualEventSignal();
 
 private:
 
@@ -400,9 +381,6 @@ public:
   DevelControl::State mState;
   std::string mSubStateName;
 
-  // Layout
-  Toolkit::Internal::LayoutItemPtr mLayout;
-
   int mLeftFocusableActorId;       ///< Actor ID of Left focusable control.
   int mRightFocusableActorId;      ///< Actor ID of Right focusable control.
   int mUpFocusableActorId;         ///< Actor ID of Up focusable control.
@@ -418,6 +396,7 @@ public:
   Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal;
   Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusLostSignal;
   Toolkit::Control::ResourceReadySignalType mResourceReadySignal;
+  DevelControl::VisualEventSignalType mVisualEventSignal;
 
   // Gesture Detection
   PinchGestureDetector mPinchGestureDetector;
@@ -433,7 +412,6 @@ public:
   ControlBehaviour mFlags : CONTROL_BEHAVIOUR_FLAG_COUNT;    ///< Flags passed in from constructor.
   bool mIsKeyboardNavigationSupported :1;  ///< Stores whether keyboard navigation is supported by the control.
   bool mIsKeyboardFocusGroup :1;           ///< Stores whether the control is a focus group.
-  bool mIsLayoutingRequired :1;            ///< Stores whether the control needs to be Layout
 
   RegisteredVisualContainer mRemoveVisuals;         ///< List of visuals that are being replaced by another visual once ready