projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
popup
/
popup.h
diff --git
a/dali-toolkit/public-api/controls/popup/popup.h
b/dali-toolkit/public-api/controls/popup/popup.h
index
0c876a2
..
3c38259
100644
(file)
--- a/
dali-toolkit/public-api/controls/popup/popup.h
+++ b/
dali-toolkit/public-api/controls/popup/popup.h
@@
-20,7
+20,6
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
namespace Dali
{
namespace Dali
{
@@
-62,16
+61,18
@@
class Button;
*
* A popup can use various custom transition effects, e.g.
* Alpha fade, Scaling transition, position/rotation, shader effects.
*
* A popup can use various custom transition effects, e.g.
* Alpha fade, Scaling transition, position/rotation, shader effects.
+ *
+ * Signals
+ * | %Signal Name | Method |
+ * |-------------------|------------------------------|
+ * | touched-outside | @ref OutsideTouchedSignal() |
+ * | hidden | @ref HiddenSignal() |
*/
class DALI_IMPORT_API Popup : public Control
{
public:
*/
class DALI_IMPORT_API Popup : public Control
{
public:
- //Signal Names
- static const char* const SIGNAL_TOUCHED_OUTSIDE; ///< name "touched-outside"
- static const char* const SIGNAL_HIDDEN; ///< name "hidden"
-
/**
* @brief Current popup state.
*/
/**
* @brief Current popup state.
*/
@@
-165,18
+166,11
@@
public:
void SetTitle( const std::string& text );
/**
void SetTitle( const std::string& text );
/**
- * @brief Sets a title for this Popup.
- *
- * @param[in] titleActor The TextView to appear as the heading for this Popup
- */
- void SetTitle( TextView titleActor );
-
- /**
* @brief Gets the text (TextView) for this Popup.
*
* @brief Gets the text (TextView) for this Popup.
*
- * @return The
TextView representing this popup is returned.
+ * @return The
text to appear as the heading for this Popup
*/
*/
-
TextView
GetTitle() const;
+
const std::string&
GetTitle() const;
/**
* @brief Adds a button to this Popup.
/**
* @brief Adds a button to this Popup.