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.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
super-blur-view
/
super-blur-view.cpp
diff --git
a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
index
fda059b
..
9e65519
100644
(file)
--- a/
dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
+++ b/
dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
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.
@@
-23,56
+23,48
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
SuperBlurView::SuperBlurView()
{
}
SuperBlurView::SuperBlurView()
{
}
-SuperBlurView SuperBlurView::New(
unsigned int blurLevels
)
+SuperBlurView SuperBlurView::New(
unsigned int blurLevels
)
{
{
- return Internal::SuperBlurView::New(
blurLevels
);
+ return Internal::SuperBlurView::New(
blurLevels
);
}
}
-SuperBlurView::SuperBlurView( const SuperBlurView& handle )
-: Control( handle )
-{
-}
+SuperBlurView::SuperBlurView(const SuperBlurView& handle) = default;
-SuperBlurView& SuperBlurView::operator=( const SuperBlurView& rhs )
-{
- if( &rhs != this )
- {
- Control::operator=(rhs);
- }
- return *this;
-}
+SuperBlurView& SuperBlurView::operator=(const SuperBlurView& rhs) = default;
+
+SuperBlurView::SuperBlurView(SuperBlurView&& handle) = default;
+
+SuperBlurView& SuperBlurView::operator=(SuperBlurView&& rhs) = default;
SuperBlurView::~SuperBlurView()
{
}
SuperBlurView::~SuperBlurView()
{
}
-SuperBlurView SuperBlurView::DownCast(
BaseHandle handle
)
+SuperBlurView SuperBlurView::DownCast(
BaseHandle handle
)
{
{
- return Control::DownCast<SuperBlurView, Internal::SuperBlurView>(
handle
);
+ return Control::DownCast<SuperBlurView, Internal::SuperBlurView>(
handle
);
}
SuperBlurView::SuperBlurView(Internal::SuperBlurView& implementation)
}
SuperBlurView::SuperBlurView(Internal::SuperBlurView& implementation)
-: Control(
implementation
)
+: Control(
implementation
)
{
}
SuperBlurView::SuperBlurView(Dali::Internal::CustomActor* internal)
{
}
SuperBlurView::SuperBlurView(Dali::Internal::CustomActor* internal)
-: Control(
internal
)
+: Control(
internal
)
{
{
- VerifyCustomActorPointer<Internal::SuperBlurView>(
internal
);
+ VerifyCustomActorPointer<Internal::SuperBlurView>(
internal
);
}
}
-void SuperBlurView::Set
Image(Image inputImag
e)
+void SuperBlurView::Set
Texture(Texture textur
e)
{
{
- GetImpl(*this).Set
Image( inputImage
);
+ GetImpl(*this).Set
Texture(texture
);
}
Property::Index SuperBlurView::GetBlurStrengthPropertyIndex() const
}
Property::Index SuperBlurView::GetBlurStrengthPropertyIndex() const
@@
-80,9
+72,9
@@
Property::Index SuperBlurView::GetBlurStrengthPropertyIndex() const
return GetImpl(*this).GetBlurStrengthPropertyIndex();
}
return GetImpl(*this).GetBlurStrengthPropertyIndex();
}
-void SuperBlurView::SetBlurStrength(
float blurStrength
)
+void SuperBlurView::SetBlurStrength(
float blurStrength
)
{
{
- GetImpl(*this).SetBlurStrength(
blurStrength
);
+ GetImpl(*this).SetBlurStrength(
blurStrength
);
}
float SuperBlurView::GetCurrentBlurStrength() const
}
float SuperBlurView::GetCurrentBlurStrength() const
@@
-95,9
+87,9
@@
SuperBlurView::SuperBlurViewSignal& SuperBlurView::BlurFinishedSignal()
return GetImpl(*this).BlurFinishedSignal();
}
return GetImpl(*this).BlurFinishedSignal();
}
-
Image SuperBlurView::GetBlurredImage( unsigned int level
)
+
Texture SuperBlurView::GetBlurredTexture(unsigned int level
)
{
{
- return GetImpl(*this).GetBlurred
Image( level
);
+ return GetImpl(*this).GetBlurred
Texture(level
);
}
} // namespace Toolkit
}
} // namespace Toolkit