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
Add move semantics to common and base Toolkit classes
[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
ff955ff
..
3802239
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
14
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.
@@
-41,19
+41,13
@@
Scrollable::Scrollable( Dali::Internal::CustomActor* 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 ) = default;
+
+Scrollable& Scrollable::operator=( const Scrollable& handle ) = default;
+
+Scrollable& Scrollable::operator=( Scrollable&& rhs ) = default;
Scrollable::~Scrollable()
{
Scrollable::~Scrollable()
{
@@
-79,19
+73,14
@@
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 )