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 changes I7066e6c1,I3f0c228e into devel/master
[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
1c7039b
..
1a84b2d
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-89,7
+89,12
@@
public:
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
*/
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
*/
- virtual float GetHeightForWidth( float width ) const;
+ virtual float GetHeightForWidth( float width );
+
+ /**
+ * @copydoc Toolkit::Visual::Base::GetWidthForHeight
+ */
+ virtual float GetWidthForHeight( float height );
/**
* @copydoc Toolkit::Visual::Base::GetNaturalSize
/**
* @copydoc Toolkit::Visual::Base::GetNaturalSize