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
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
[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
d75509a
..
22b91bf
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
/*
#define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-68,7
+68,7
@@
public:
* If the handle is empty, ImageView will display nothing
* @param[in] map The Dali::Property::Map to use for to display.
*/
* If the handle is empty, ImageView will display nothing
* @param[in] map The Dali::Property::Map to use for to display.
*/
- void SetImage(
Dali::Property::Map
map );
+ void SetImage(
const Dali::Property::Map&
map );
/**
* @copydoc Dali::Toolkit::SetImage
/**
* @copydoc Dali::Toolkit::SetImage
@@
-123,21
+123,11
@@
public:
private: // From Control
/**
private: // From Control
/**
- * @copydoc
Toolkit::Control::OnStageConnect
()
+ * @copydoc
CustomActorImpl::OnStageConnection
()
*/
virtual void OnStageConnection( int depth );
/**
*/
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::GetNaturalSize
*/
virtual Vector3 GetNaturalSize();
* @copydoc Toolkit::Control::GetNaturalSize
*/
virtual Vector3 GetNaturalSize();
@@
-152,15
+142,18
@@
private: // From Control
*/
virtual float GetWidthForHeight( float height );
*/
virtual float GetWidthForHeight( float height );
+ /**
+ * @copydoc Toolkit::Control::OnRelayout()
+ */
+ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+
private:
// Undefined
ImageView( const ImageView& );
ImageView& operator=( const ImageView& );
private:
private:
// Undefined
ImageView( const ImageView& );
ImageView& operator=( const ImageView& );
private:
- Toolkit::Visual mRenderer;
- ImageDimensions mImageSize;
- Vector2 mSizeSet;
+ Toolkit::Visual::Base mVisual;
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