X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.h;h=04e8205d8b68db08eddc476034b756f8076a350b;hp=dad426f9d7a33fe0641a61fe7a8ed7c25b240dbf;hb=4d3140d11ea9df2cf933d32419f49fc5e63fa4a9;hpb=f558388c388bcdf4939ca7af098cbcfc1631ad89

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index dad426f..04e8205 100755
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_DEVEL_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.
@@ -23,7 +23,6 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
-#include <dali-toolkit/devel-api/layouting/layout-item.h>
 
 namespace Dali
 {
@@ -53,13 +52,13 @@ namespace Property
 
 enum
 {
-  STYLE_NAME        = Control::Property::STYLE_NAME,
-  BACKGROUND_COLOR  = Control::Property::BACKGROUND_COLOR,
-  BACKGROUND_IMAGE  = Control::Property::BACKGROUND_IMAGE,
-  KEY_INPUT_FOCUS   = Control::Property::KEY_INPUT_FOCUS,
-  BACKGROUND        = Control::Property::BACKGROUND,
-  MARGIN            = Control::Property::MARGIN,
-  PADDING           = Control::Property::PADDING,
+  STYLE_NAME            = Control::Property::STYLE_NAME,
+  RESERVED_PROPERTY_01  = Control::Property::RESERVED_PROPERTY_01,
+  RESERVED_PROPERTY_02  = Control::Property::RESERVED_PROPERTY_02,
+  KEY_INPUT_FOCUS       = Control::Property::KEY_INPUT_FOCUS,
+  BACKGROUND            = Control::Property::BACKGROUND,
+  MARGIN                = Control::Property::MARGIN,
+  PADDING               = Control::Property::PADDING,
 
   /**
    * @brief Displays a tooltip when the control is hovered over.
@@ -116,7 +115,13 @@ enum
    * @details Name "downFocusableActorId", type Property::INTEGER.
    *
    */
-  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7
+  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7,
+
+  /**
+   * @brief The shadow of the control.
+   * @details Name "shadow", type Property::MAP.
+   */
+  SHADOW = PADDING + 8
 };
 
 } // namespace Property
@@ -271,64 +276,6 @@ DALI_TOOLKIT_API void DoAction( Control& control, Dali::Property::Index visualIn
 DALI_TOOLKIT_API void SetInputMethodContext( Internal::Control& control, InputMethodContext& inputMethodContext );
 
 /**
- * @brief Get the layout associated with this control, if any.
- *
- * @return A handle to the layout, or empty.
- */
-DALI_TOOLKIT_API Toolkit::LayoutItem GetLayout( Internal::Control& control );
-
-/**
- * @brief Get the layout associated with a control, if any.
- *
- * @return A handle to the layout, or empty.
- */
-DALI_TOOLKIT_API Toolkit::LayoutItem GetLayout( Control control );
-
-/**
- * @brief Set the layout on this control.
- *
- * @param[in] control The internal Control to set the layout on
- * @param[in] layout Pointer to the layout
- * @note Providing an empty layout will remove the current layout and
- *       replace it with a BinLayout.
- *       Setting a layout that has already been set will result in the
- *       original control becoming a BinLayout.  Two Controls can not share
- *       the same layout.
- */
-DALI_TOOLKIT_API void SetLayout( Internal::Control& control, Toolkit::LayoutItem layout );
-
-/**
- * @brief Set the layout on a control.
- *
- * @param[in] control The Control to set the layout on
- * @param[in] layout Pointer to the layout
- * @note Providing an empty layout will remove the current layout and
- *       replace it with a BinLayout.
- */
-DALI_TOOLKIT_API void SetLayout( Control control, Toolkit::LayoutItem layout );
-
-/**
- * @brief Request the control layout.
- *
- * @param[in] control The internal Control to request the layout of
- */
-DALI_TOOLKIT_API void RequestLayout( Internal::Control& control );
-
-/**
- * @brief Set whether the control should have a layout
- * @param[in] control The Control to set the behaviour on
- * @param[in] layoutingRequired true if the control should have a layout
- */
-DALI_TOOLKIT_API void SetLayoutingRequired( Control control, bool layoutingRequired );
-
-/**
- * @brief Check if the control has been set to require layouting
- * @param[in] control The Control to query
- * @return true if the control needs layouting
- */
-DALI_TOOLKIT_API bool IsLayoutingRequired( Control control );
-
-/**
  * @brief Visual Event signal type
  */
 using VisualEventSignalType = Signal< void ( Control, Dali::Property::Index, Dali::Property::Index ) >;