X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.h;h=eb2bcda8c0a6e16da60ee9b40640986025209770;hb=8e4eaa8227ac1a8c56ab88fbafa826715c0cc486;hp=879c767dcc7183d2673e65d00750368af820d437;hpb=a9a328dcfc54d425f08f78e16623671eb3110fed;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index 879c767..eb2bcda 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.
@@ -270,42 +269,21 @@ 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
- */
-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
+ * @brief Visual Event signal type
  */
-DALI_TOOLKIT_API void SetLayout( Control control, Toolkit::LayoutItem layout );
+using VisualEventSignalType = Signal< void ( Control, Dali::Property::Index, Dali::Property::Index ) >;
 
 /**
- * @brief Request the control layout.
+ * @brief This signal is emitted when a visual has an event to notify.
  *
- * @param[in] control The internal Control to request the layout of
+ * A callback of the following type may be connected:
+ * @code
+ *   void YourCallbackName( Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId );
+ * @endcode
+ * @return The signal to connect to
  */
-DALI_TOOLKIT_API void RequestLayout( Internal::Control& control );
+DALI_TOOLKIT_API VisualEventSignalType& VisualEventSignal( Control control );
 
 } // namespace DevelControl