(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 6251c01..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__
 
 /*
 #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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -89,6 +89,7 @@ public:
       BACKING_ENABLED,              ///< name "backingEnabled",         type bool
       BACKING_COLOR,                ///< name "backingColor",           type Vector4
       POPUP_BACKGROUND_IMAGE,       ///< name "popupBackgroundImage",   type std::string
       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_UP_IMAGE,                ///< name "tailUpImage",            type std::string
       TAIL_DOWN_IMAGE,              ///< name "tailDownImage",          type std::string
       TAIL_LEFT_IMAGE,              ///< name "tailLeftImage",          type std::string