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
Removed OnButton virtual functions and simplified RadioButton logic
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
button.h
diff --git
a/dali-toolkit/public-api/controls/buttons/button.h
b/dali-toolkit/public-api/controls/buttons/button.h
index
3b649d1
..
68b2567
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/button.h
+++ b/
dali-toolkit/public-api/controls/buttons/button.h
@@
-95,7
+95,6
@@
class Button;
* | Property::SELECTED_BACKGROUND_VISUAL | selectedBackgroundVisual | MAP | Y | N |
* | Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL | disabledUnselectedBackgroundVisual | MAP | Y | N |
* | Property::DISABLED_SELECTED_BACKGROUND_VISUAL | disabledSelectedBackgroundVisual | MAP | Y | N |
* | Property::SELECTED_BACKGROUND_VISUAL | selectedBackgroundVisual | MAP | Y | N |
* | Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL | disabledUnselectedBackgroundVisual | MAP | Y | N |
* | Property::DISABLED_SELECTED_BACKGROUND_VISUAL | disabledSelectedBackgroundVisual | MAP | Y | N |
- * | Property::LABEL_STRUT_LENGTH | labelStrutLength | INTEGER | Y | N |
* | Property::LABEL_RELATIVE_ALIGNMENT | labelRelativeAlignment | STRING | Y | N |
* -------------------------------------------------------------------------------------------------------------------------------------
*
* | Property::LABEL_RELATIVE_ALIGNMENT | labelRelativeAlignment | STRING | Y | N |
* -------------------------------------------------------------------------------------------------------------------------------------
*
@@
-291,13
+290,6
@@
public:
DISABLED_SELECTED_BACKGROUND_VISUAL,
/**
DISABLED_SELECTED_BACKGROUND_VISUAL,
/**
- * @brief name "labelStrutLength", type INTEGER
- * @details Sets the distance between the label and foreground/icon visual if both present
- * @SINCE_1_2.XX
- */
- LABEL_STRUT_LENGTH, // todo ????? remove
-
- /**
* @brief name "labelRelativeAlignment", type STRING
* @details Sets the position of the the label in relation to the foreground/icon if both present
* @SINCE_1_2.XX
* @brief name "labelRelativeAlignment", type STRING
* @details Sets the position of the the label in relation to the foreground/icon if both present
* @SINCE_1_2.XX