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
Changed README to README.md
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.h
b/dali-toolkit/internal/visuals/visual-base-impl.h
index
c073518
..
3334842
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-85,6
+85,11
@@
public:
const Vector2& GetSize() const;
/**
const Vector2& GetSize() const;
/**
+ * @copydoc Toolkit::Visual::Base::GetHeightForWidth
+ */
+ virtual float GetHeightForWidth( float width ) const;
+
+ /**
* @copydoc Toolkit::Visual::Base::GetNaturalSize
*/
virtual void GetNaturalSize( Vector2& naturalSize ) const;
* @copydoc Toolkit::Visual::Base::GetNaturalSize
*/
virtual void GetNaturalSize( Vector2& naturalSize ) const;
@@
-120,7
+125,7
@@
public:
*
* @param[in] preMultipled whether alpha is pre-multiplied.
*/
*
* @param[in] preMultipled whether alpha is pre-multiplied.
*/
- void EnablePreMultipliedAlpha(
bool preMultipled );
+ void EnablePreMultipliedAlpha( bool preMultipled );
/**
* @brief Query whether alpha is pre-multiplied.
/**
* @brief Query whether alpha is pre-multiplied.