(Popup) Fix various bugs in Popup

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / popup / popup.h

diff --git a/dali-toolkit/devel-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h
index 40b4df3..3d3d915 100644 (file)
--- a/dali-toolkit/devel-api/controls/popup/popup.h
+++ b/dali-toolkit/devel-api/controls/popup/popup.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_POPUP_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -46,7 +46,7 @@ class Popup;
  * Signals
  * | %Signal Name      | Method                       |
  * |-------------------|------------------------------|
- * | touched-outside   | @ref OutsideTouchedSignal()  |
+ * | touchedOutside    | @ref OutsideTouchedSignal()  |
  * | showing           | @ref ShowingSignal()         |
  * | shown             | @ref ShownSignal()           |
  * | hiding            | @ref HidingSignal()          |
@@ -76,23 +76,24 @@ public:
       TITLE = PROPERTY_START_INDEX, ///< name "title",                  type Property::Map
       CONTENT,                      ///< name "content",                type Property::Map
       FOOTER,                       ///< name "footer",                 type Property::Map
-      DISPLAY_STATE,                ///< name "display-state",          type std::string
-      TOUCH_TRANSPARENT,            ///< name "touch-transparent",      type bool
-      TAIL_VISIBILITY,              ///< name "tail-visibility",        type bool
-      TAIL_POSITION,                ///< name "tail-position",          type Vector3
-      CONTEXTUAL_MODE,              ///< name "contextual-mode",        type std::string
-      ANIMATION_DURATION,           ///< name "animation-duration",     type float
-      ANIMATION_MODE,               ///< name "animation-mode",         type std::string
-      ENTRY_ANIMATION,              ///< name "entry-animation",        type Property::Map
-      EXIT_ANIMATION,               ///< name "exit-animation",         type Property::Map
-      AUTO_HIDE_DELAY,              ///< name "auto-hide-delay",        type int
-      BACKING_ENABLED,              ///< name "backing-enabled",        type bool
-      BACKING_COLOR,                ///< name "backing-color",          type Vector4
-      POPUP_BACKGROUND_IMAGE,       ///< name "popup-background-image", type std::string
-      TAIL_UP_IMAGE,                ///< name "tail-up-image",          type std::string
-      TAIL_DOWN_IMAGE,              ///< name "tail-down-image",        type std::string
-      TAIL_LEFT_IMAGE,              ///< name "tail-left-image",        type std::string
-      TAIL_RIGHT_IMAGE,             ///< name "tail-right-image",       type std::string
+      DISPLAY_STATE,                ///< name "displayState",           type std::string
+      TOUCH_TRANSPARENT,            ///< name "touchTransparent",       type bool
+      TAIL_VISIBILITY,              ///< name "tailVisibility",         type bool
+      TAIL_POSITION,                ///< name "tailPosition",           type Vector3
+      CONTEXTUAL_MODE,              ///< name "contextualMode",         type std::string
+      ANIMATION_DURATION,           ///< name "animationDuration",      type float
+      ANIMATION_MODE,               ///< name "animationMode",          type std::string
+      ENTRY_ANIMATION,              ///< name "entryAnimation",         type Property::Map
+      EXIT_ANIMATION,               ///< name "exitAnimation",          type Property::Map
+      AUTO_HIDE_DELAY,              ///< name "autoHideDelay",          type int
+      BACKING_ENABLED,              ///< name "backingEnabled",         type bool
+      BACKING_COLOR,                ///< name "backingColor",           type Vector4
+      POPUP_BACKGROUND_IMAGE,       ///< name "popupBackgroundImage",   type std::string
+      POPUP_BACKGROUND_BORDER,      ///< name "popupBackgroundBorder",  type Rect< int >,      Values are in the order: left, right, bottom, top
+      TAIL_UP_IMAGE,                ///< name "tailUpImage",            type std::string
+      TAIL_DOWN_IMAGE,              ///< name "tailDownImage",          type std::string
+      TAIL_LEFT_IMAGE,              ///< name "tailLeftImage",          type std::string
+      TAIL_RIGHT_IMAGE,             ///< name "tailRightImage",         type std::string
     };
   };
 
@@ -215,7 +216,7 @@ public:
   /**
    * @brief Sets the actor to use for a footer in this Popup.
    *
-   * @param[in] control The footer actor to be added to this Popup
+   * @param[in] footer The footer actor to be added to this Popup
    */
   void SetFooter( Actor footer );