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 "Empty Implementation for INPUT_METHOD_SETTINGS property" into tizen
[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
041e717
..
923cb8f
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
@@
-119,11
+119,6
@@
private: // from Control
*/
virtual void OnControlSizeSet(const Vector3& targetSize);
*/
virtual void OnControlSizeSet(const Vector3& targetSize);
- /**
- * @copydoc Control::OnRelayout()
- */
- virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
-
private:
/**
private:
/**