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 "Stop CreateSolidActor from creating an RGBA BufferImage when it isn't needed...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
super-blur-view
/
super-blur-view-impl.h
diff --git
a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index
db9c613
..
3488c2c
100644
(file)
--- a/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@
-20,7
+20,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/super-blur-view/super-blur-view.h>
+#include <dali-toolkit/
devel
-api/controls/super-blur-view/super-blur-view.h>
#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
namespace Dali
#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
namespace Dali
@@
-39,14
+39,6
@@
namespace Internal
*/
class SuperBlurView : public Control
{
*/
class SuperBlurView : public Control
{
-public:
-
- // Properties
- enum
- {
- SUPER_BLUR_VIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- SUPER_BLUR_VIEW_PROPERTY_END_INDEX = SUPER_BLUR_VIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
- };
public:
public:
@@
-123,14
+115,9
@@
private: // from Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc Toolkit::Control::OnControlSizeSet
- */
- virtual void OnControlSizeSet(const Vector3& targetSize);
-
- /**
- * @copydoc Control::OnRelayout()
+ * @copydoc CustomActorImpl::OnSizeSet()
*/
*/
- virtual void On
Relayout( const Vector2& size, ActorSizeContainer& container
);
+ virtual void On
SizeSet(const Vector3& targetSize
);
private:
private: