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 "Added code for stylable transitions" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.h
diff --git
a/dali-toolkit/internal/controls/image-view/image-view-impl.h
b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index
3dec1b0
..
f4f38b6
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.h
@@
-22,7
+22,7
@@
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/
controls/renderer
s/image/image-visual.h>
+#include <dali-toolkit/internal/
visual
s/image/image-visual.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
@@
-114,7
+114,7
@@
public:
/**
* @brief Set the depth index of this image renderer
*
/**
* @brief Set the depth index of this image renderer
*
- * Renderer with higher depth indices are rendered in front of other
renderer
s with smaller values
+ * Renderer with higher depth indices are rendered in front of other
visual
s with smaller values
*
* @param[in] depthIndex The depth index of this renderer
*/
*
* @param[in] depthIndex The depth index of this renderer
*/
@@
-123,16
+123,6
@@
public:
private: // From Control
/**
private: // From Control
/**
- * @copydoc Toolkit::Control::OnStageConnect()
- */
- virtual void OnStageConnection( int depth );
-
- /**
- * @copydoc Toolkit::Control::OnStageDisconnection()
- */
- virtual void OnStageDisconnection();
-
- /**
* @copydoc Toolkit::Control::OnSizeSet()
*/
virtual void OnSizeSet( const Vector3& targetSize );
* @copydoc Toolkit::Control::OnSizeSet()
*/
virtual void OnSizeSet( const Vector3& targetSize );
@@
-158,9
+148,9
@@
private:
ImageView& operator=( const ImageView& );
private:
ImageView& operator=( const ImageView& );
private:
- Toolkit::Visual
mRenderer
;
- ImageDimensions mImageSize;
- Vector2 mSizeSet;
+ Toolkit::Visual
::Base mVisual
;
+ ImageDimensions
mImageSize;
+ Vector2
mSizeSet;
std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise
Image mImage; ///< the Image if the image came from a Image, null otherwise
std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise
Image mImage; ///< the Image if the image came from a Image, null otherwise