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
Updated control transitions to work with visual transform
[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
..
f496467
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-22,6
+22,7
@@
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/rendering/renderer.h>
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
@@
-89,7
+90,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
@@
-152,6
+158,11
@@
public:
*/
Dali::Property::Value GetProperty( Dali::Property::Index index );
*/
Dali::Property::Value GetProperty( Dali::Property::Index index );
+ /**
+ * Gets currently staged renderer, or an empty handle if not staged
+ */
+ Renderer GetRenderer();
+
protected:
/**
protected:
/**