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.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scrollable.cpp
diff --git
a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
index
cbad738
..
f46d699
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scrollable.cpp
+++ b/
dali-toolkit/public-api/controls/scrollable/scrollable.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-15,17
+15,15
@@
*
*/
*
*/
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
#include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
#include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
using namespace Dali;
namespace Dali
{
using namespace Dali;
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
Scrollable::Scrollable()
{
}
Scrollable::Scrollable()
{
}
@@
-35,31
+33,25
@@
Scrollable::Scrollable(Internal::Scrollable& implementation)
{
}
{
}
-Scrollable::Scrollable(
Dali::Internal::CustomActor* internal
)
-: Control(
internal
)
+Scrollable::Scrollable(
Dali::Internal::CustomActor* internal
)
+: Control(
internal
)
{
VerifyCustomActorPointer<Internal::Scrollable>(internal);
}
{
VerifyCustomActorPointer<Internal::Scrollable>(internal);
}
-Scrollable::Scrollable( const Scrollable& handle )
-: Control( handle )
-{
-}
+Scrollable::Scrollable(const Scrollable& handle) = default;
-Scrollable& Scrollable::operator=( const Scrollable& handle )
-{
- if( &handle != this )
- {
- Control::operator=( handle );
- }
- return *this;
-}
+Scrollable::Scrollable(Scrollable&& rhs) noexcept = default;
+
+Scrollable& Scrollable::operator=(const Scrollable& handle) = default;
+
+Scrollable& Scrollable::operator=(Scrollable&& rhs) noexcept = default;
Scrollable::~Scrollable()
{
}
Scrollable::~Scrollable()
{
}
-Scrollable Scrollable::DownCast(
BaseHandle handle
)
+Scrollable Scrollable::DownCast(
BaseHandle handle
)
{
return Control::DownCast<Scrollable, Internal::Scrollable>(handle);
}
{
return Control::DownCast<Scrollable, Internal::Scrollable>(handle);
}
@@
-79,22
+71,17
@@
Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal()
return GetImpl(*this).ScrollCompletedSignal();
}
return GetImpl(*this).ScrollCompletedSignal();
}
-bool Scrollable::IsScrollComponentEnabled(Scrollable::ScrollComponentType indicator) const
-{
- return GetImpl(*this).IsScrollComponentEnabled(indicator);
-}
-
-void Scrollable::EnableScrollComponent(Scrollable::ScrollComponentType indicator)
+bool Scrollable::IsOvershootEnabled() const
{
{
-
GetImpl(*this).EnableScrollComponent(indicator
);
+
return GetImpl(*this).IsOvershootEnabled(
);
}
}
-void Scrollable::
DisableScrollComponent(Scrollable::ScrollComponentType indicator
)
+void Scrollable::
SetOvershootEnabled(bool enable
)
{
{
- GetImpl(*this).
DisableScrollComponent(indicator
);
+ GetImpl(*this).
SetOvershootEnabled(enable
);
}
}
-void Scrollable::SetOvershootEffectColor(
const Vector4& color
)
+void Scrollable::SetOvershootEffectColor(
const Vector4& color
)
{
GetImpl(*this).SetOvershootEffectColor(color);
}
{
GetImpl(*this).SetOvershootEffectColor(color);
}
@@
-104,7
+91,7
@@
Vector4 Scrollable::GetOvershootEffectColor() const
return GetImpl(*this).GetOvershootEffectColor();
}
return GetImpl(*this).GetOvershootEffectColor();
}
-void Scrollable::SetOvershootAnimationSpeed(
float pixelsPerSecond
)
+void Scrollable::SetOvershootAnimationSpeed(
float pixelsPerSecond
)
{
GetImpl(*this).SetOvershootAnimationSpeed(pixelsPerSecond);
}
{
GetImpl(*this).SetOvershootAnimationSpeed(pixelsPerSecond);
}