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
[dali_2.3.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
effects-view
/
effects-view.h
diff --git
a/dali-toolkit/devel-api/controls/effects-view/effects-view.h
b/dali-toolkit/devel-api/controls/effects-view/effects-view.h
index
6196617
..
1b1147b
100644
(file)
--- a/
dali-toolkit/devel-api/controls/effects-view/effects-view.h
+++ b/
dali-toolkit/devel-api/controls/effects-view/effects-view.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_EFFECTS_VIEW_H__
-#define
__DALI_TOOLKIT_EFFECTS_VIEW_H__
+#ifndef
DALI_TOOLKIT_EFFECTS_VIEW_H
+#define
DALI_TOOLKIT_EFFECTS_VIEW_H
/*
/*
- * Copyright (c) 20
18
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
22
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.
@@
-19,23
+19,20
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/images/
frame-buffer-image
.h>
+#include <dali/public-api/images/
pixel
.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
namespace Dali
{
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
namespace Internal DALI_INTERNAL
{
-
class EffectsView;
class EffectsView;
-} // namespace
Internal
+} // namespace
DALI_INTERNAL
/**
* EffectsView: Applies an effect to a tree of actors
/**
* EffectsView: Applies an effect to a tree of actors
@@
-45,8
+42,8
@@
class EffectsView;
* EffectsView effectsView = EffectsView::New( Toolkit::EffectsView::EMBOSS );
*
* // set position and format
* EffectsView effectsView = EffectsView::New( Toolkit::EffectsView::EMBOSS );
*
* // set position and format
- * effectsView.SetP
arentOrigin(
ParentOrigin::CENTER );
- * effectsView.Set
Size(
Vector2( width, height) );
+ * effectsView.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER );
+ * effectsView.Set
Property( Actor::Property::SIZE,
Vector2( width, height) );
* effectsView.SetPixelFormat( Pixel::RGBA8888 );
*
* // set effect type and properties
* effectsView.SetPixelFormat( Pixel::RGBA8888 );
*
* // set effect type and properties
@@
-63,7
+60,6
@@
class EffectsView;
class DALI_TOOLKIT_API EffectsView : public Control
{
public:
class DALI_TOOLKIT_API EffectsView : public Control
{
public:
-
enum EffectType
{
DROP_SHADOW,
enum EffectType
{
DROP_SHADOW,
@@
-76,11
+72,11
@@
public:
*/
enum PropertyRange
{
*/
enum PropertyRange
{
- PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
///< @SINCE_1_0.0
- PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000,
///< Reserve property indices @SINCE_1_0.0
+ PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_0.0
+ PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000,
///< Reserve property indices @SINCE_1_0.0
- ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
///< @SINCE_1_1.18
- ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices, @SINCE_1_1.18
+ ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, ///< @SINCE_1_1.18
+ ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices, @SINCE_1_1.18
};
/**
};
/**
@@
-91,7
+87,7
@@
public:
enum
{
// Event side properties
enum
{
// Event side properties
- EFFECT_SIZE = PROPERTY_START_INDEX,
///< name "effectSize", type INTEGER
+ EFFECT_SIZE = PROPERTY_START_INDEX, ///< name "effectSize", type INTEGER
// Animatable properties
EFFECT_OFFSET = ANIMATABLE_PROPERTY_START_INDEX, ///< name "effectOffset", type VECTOR3
// Animatable properties
EFFECT_OFFSET = ANIMATABLE_PROPERTY_START_INDEX, ///< name "effectOffset", type VECTOR3
@@
-100,13
+96,12
@@
public:
};
public:
};
public:
-
/**
* Create an EffectsView object with default configuration
* @param[in] type The type of effect to be performed by the EffectView.
* A member of the EffectType enumeration.
*/
/**
* Create an EffectsView object with default configuration
* @param[in] type The type of effect to be performed by the EffectView.
* A member of the EffectType enumeration.
*/
- static EffectsView New(
EffectType type
);
+ static EffectsView New(
EffectType type
);
/**
* Create an uninitialized EffectsView. Only derived versions can be instantiated.
/**
* Create an uninitialized EffectsView. Only derived versions can be instantiated.
@@
-116,13
+111,29
@@
public:
/**
* Copy constructor.
/**
* Copy constructor.
+ * @param[in] handle to copy from
*/
*/
- EffectsView(
const EffectsView& handle
);
+ EffectsView(
const EffectsView& handle
);
/**
* Assignment operator.
/**
* Assignment operator.
+ * @param[in] handle to copy from
+ * @return reference to this
+ */
+ EffectsView& operator=(const EffectsView& handle);
+
+ /**
+ * Move constructor.
+ * @param[in] rhs to move from
*/
*/
- EffectsView& operator=( const EffectsView& rhs );
+ EffectsView(EffectsView&& rhs);
+
+ /**
+ * Move assignment operator.
+ * @param[in] rhs to move from
+ * @return reference to this
+ */
+ EffectsView& operator=(EffectsView&& rhs);
/**
* Downcast an Object handle to EffectsView. If handle points to a EffectsView the
/**
* Downcast an Object handle to EffectsView. If handle points to a EffectsView the
@@
-130,7
+141,7
@@
public:
* @param[in] handle Handle to an object
* @return handle to a EffectsView or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return handle to a EffectsView or an uninitialized handle
*/
- static EffectsView DownCast(
BaseHandle handle
);
+ static EffectsView DownCast(
BaseHandle handle
);
/**
* @brief Destructor
/**
* @brief Destructor
@@
-140,7
+151,6
@@
public:
~EffectsView();
public:
~EffectsView();
public:
-
/**
* Get the effect type
* @return The type of effect performed by the EffectView. A member of the EffectType enumeration.
/**
* Get the effect type
* @return The type of effect performed by the EffectView. A member of the EffectType enumeration.
@@
-157,39
+167,38
@@
public:
* @param[in] onDemand Set true to enable on demand rendering, call Refresh() whenever a render is required.
* Set false to render each frame. (EffectsView refresh mode is set to continuous by default).
*/
* @param[in] onDemand Set true to enable on demand rendering, call Refresh() whenever a render is required.
* Set false to render each frame. (EffectsView refresh mode is set to continuous by default).
*/
- void SetRefreshOnDemand(
bool onDemand
);
+ void SetRefreshOnDemand(
bool onDemand
);
-
/**
+ /**
* Set the pixel format for the output
* @param[in] pixelFormat The pixel format for the output
*/
* Set the pixel format for the output
* @param[in] pixelFormat The pixel format for the output
*/
-
void SetPixelFormat( Pixel::Format pixelFormat
);
+
void SetPixelFormat(Pixel::Format pixelFormat
);
-
/**
+ /**
* Set background color for the view. The background will be filled with this color.
* @param[in] color The background color.
*/
* Set background color for the view. The background will be filled with this color.
* @param[in] color The background color.
*/
-
void SetBackgroundColor( const Vector4& color
);
+
void SetBackgroundColor(const Vector4& color
);
-
/**
+ /**
* Get the background color.
* @return The background color.
*/
* Get the background color.
* @return The background color.
*/
-
Vector4 GetBackgroundColor() const;
+ Vector4 GetBackgroundColor() const;
public: // Not intended for application developers
public: // Not intended for application developers
-
/**
* Creates a handle using the Toolkit::Internal implementation.
* @param[in] implementation The Control implementation.
*/
/**
* Creates a handle using the Toolkit::Internal implementation.
* @param[in] implementation The Control implementation.
*/
- DALI_INTERNAL EffectsView(
Internal::EffectsView& implementation
);
+ DALI_INTERNAL EffectsView(
Internal::EffectsView& implementation
);
/**
* Allows the creation of this Control from an Internal::CustomActor pointer.
* @param[in] internal A pointer to the internal CustomActor.
*/
/**
* Allows the creation of this Control from an Internal::CustomActor pointer.
* @param[in] internal A pointer to the internal CustomActor.
*/
- explicit DALI_INTERNAL EffectsView(
Dali::Internal::CustomActor* internal
);
+ explicit DALI_INTERNAL EffectsView(
Dali::Internal::CustomActor* internal
);
}; // class EffectsView
}; // class EffectsView
@@
-197,4
+206,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_EFFECTS_VIEW_H__
+#endif //
DALI_TOOLKIT_EFFECTS_VIEW_H