X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.h;h=e0421133c989f79b916f5c599660c65e7b32a2f6;hp=634e7f605ec566b4f18d4d59bb3ac7049984f3f2;hb=ee7b436210b09635d032b50eefecb7369be136e7;hpb=f558388c388bcdf4939ca7af098cbcfc1631ad89

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index 634e7f6..e042113 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.
@@ -27,7 +27,6 @@
 #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>
@@ -126,7 +125,7 @@ public:
    * @param[in] object The visual whose resources are ready
    * @note Overriding method in Visual::EventObserver.
    */
-  virtual void ResourceReady( Visual::Base& object ) override;
+  void ResourceReady( Visual::Base& object ) override;
 
   /**
    * @brief Called when an event occurs.
@@ -134,7 +133,7 @@ public:
    * @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;
+  void NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override;
 
   /**
    * @copydoc Dali::Toolkit::DevelControl::RegisterVisual()
@@ -291,9 +290,9 @@ public:
   bool IsResourceReady() const;
 
   /**
-   * @copydoc CustomActorImpl::OnStageDisconnection()
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
    */
-  void OnStageDisconnection();
+  void OnSceneDisconnection();
 
   /**
    * @brief Sets the margin.
@@ -333,40 +332,20 @@ 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 );
+  DevelControl::VisualEventSignalType& VisualEventSignal();
 
   /**
-   * @copydoc DevelControl::IsLayoutingRequired()
+   * @brief Sets the shadow with a property map.
+   * @param[in] map The shadow property map
    */
-  bool IsLayoutingRequired();
+  void SetShadow(const Property::Map& map);
 
   /**
-   * @copydoc DevelControl::VisualEventSignal()
+   * @brief Clear the shadow.
    */
-  DevelControl::VisualEventSignalType& VisualEventSignal();
+  void ClearShadow();
 
 private:
 
@@ -407,15 +386,22 @@ private:
    */
   void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, VisualState::Type enabled, DepthIndexValue::Type depthIndexValueSet, int depthIndex = 0 );
 
+  /**
+   * @brief Emits the resource ready signal.
+   */
+  void EmitResourceReadySignal();
+
+  /**
+   * @brief Callbacks called on idle.
+   */
+  void OnIdleCallback();
+
 public:
 
   Control& mControlImpl;
   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.
@@ -443,11 +429,13 @@ public:
   TooltipPtr mTooltip;
 
   InputMethodContext mInputMethodContext;
+  CallbackBase* mIdleCallback;             ///< The idle callback to emit the resource ready signal.
 
   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
+  bool mIsEmittingResourceReadySignal :1;  ///< True during ResourceReady().
+  bool mNeedToEmitResourceReady :1;        ///< True if need to emit the resource ready signal again.
 
   RegisteredVisualContainer mRemoveVisuals;         ///< List of visuals that are being replaced by another visual once ready
 
@@ -467,6 +455,7 @@ public:
   static const PropertyRegistration PROPERTY_12;
   static const PropertyRegistration PROPERTY_13;
   static const PropertyRegistration PROPERTY_14;
+  static const PropertyRegistration PROPERTY_15;
 };