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
Purge underscored header file barriers
[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
594693c
..
9f229fb
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
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
-#define
__DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H
+#define
DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-21,8
+21,8
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.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>
-#include <dali-toolkit/devel-api/
controls/renderer-factory/renderer
-factory.h>
+#include <dali-toolkit/
devel
-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/devel-api/
visual-factory/visual
-factory.h>
namespace Dali
{
namespace Dali
{
@@
-132,11
+132,6
@@
private: // from Control
virtual void OnStageConnection( int depth );
/**
virtual void OnStageConnection( int depth );
/**
- * @copydoc CustomActorImpl::OnStageDisconnection()
- */
- virtual void OnStageDisconnection();
-
- /**
* @copydoc CustomActorImpl::GetNaturalSize()
*/
virtual Vector3 GetNaturalSize();
* @copydoc CustomActorImpl::GetNaturalSize()
*/
virtual Vector3 GetNaturalSize();
@@
-161,10
+156,16
@@
private:
*/
void ClearBlurResource();
*/
void ClearBlurResource();
+ /**
+ * Sets shader effect on the control renderer
+ * @param[in,out] Sets custom shader effect on the given visual
+ */
+ void SetShaderEffect( Toolkit::Visual::Base& visual );
+
private:
std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
std::vector<FrameBufferImage> mBlurredImage;
private:
std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
std::vector<FrameBufferImage> mBlurredImage;
- std::vector<Toolkit::
ControlRenderer> mRenderer
s;
+ std::vector<Toolkit::
Visual::Base> mVisual
s;
Image mInputImage;
Vector2 mTargetSize;
Image mInputImage;
Vector2 mTargetSize;
@@
-175,7
+176,7
@@
private:
bool mResourcesCleared;
};
bool mResourcesCleared;
};
-}
+}
// namespace Internal
// Helpers for public-api forwarding methods
inline Toolkit::Internal::SuperBlurView& GetImpl( Toolkit::SuperBlurView& obj )
// Helpers for public-api forwarding methods
inline Toolkit::Internal::SuperBlurView& GetImpl( Toolkit::SuperBlurView& obj )
@@
-192,8
+193,8
@@
inline const Toolkit::Internal::SuperBlurView& GetImpl( const Toolkit::SuperBlur
return static_cast<const Toolkit::Internal::SuperBlurView&>(handle);
}
return static_cast<const Toolkit::Internal::SuperBlurView&>(handle);
}
-}
+}
// namespace Toolkit
-}
+}
// namespace Dali
-#endif /
* __DALI_TOOLKIT_INTERNALSUPER_BLUR_VIEW_H__ */
+#endif /
/ DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H