[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / text-controls / text-editor.cpp

diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.cpp b/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
index 4098e8b..331148d 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
+++ b/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -23,61 +23,63 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 TextEditor TextEditor::New()
 {
   return Internal::TextEditor::New();
 }
 
-TextEditor::TextEditor()
+TextEditor TextEditor::New(ControlBehaviour additionalBehaviour)
 {
+  return Internal::TextEditor::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
 }
 
-TextEditor::TextEditor( const TextEditor& handle )
-: Control( handle )
+TextEditor::TextEditor()
 {
 }
 
-TextEditor& TextEditor::operator=( const TextEditor& handle )
-{
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
-}
+TextEditor::TextEditor(const TextEditor& handle) = default;
+
+TextEditor::TextEditor(TextEditor&& rhs) noexcept = default;
+
+TextEditor& TextEditor::operator=(const TextEditor& handle) = default;
+
+TextEditor& TextEditor::operator=(TextEditor&& rhs) noexcept = default;
 
 TextEditor::~TextEditor()
 {
 }
 
-TextEditor TextEditor::DownCast( BaseHandle handle )
+TextEditor TextEditor::DownCast(BaseHandle handle)
 {
-  return Control::DownCast<TextEditor, Internal::TextEditor>( handle );
+  return Control::DownCast<TextEditor, Internal::TextEditor>(handle);
 }
 
 TextEditor::TextChangedSignalType& TextEditor::TextChangedSignal()
 {
-  return Dali::Toolkit::GetImpl( *this ).TextChangedSignal();
+  return Dali::Toolkit::GetImpl(*this).TextChangedSignal();
 }
 
 TextEditor::InputStyleChangedSignalType& TextEditor::InputStyleChangedSignal()
 {
-  return Dali::Toolkit::GetImpl( *this ).InputStyleChangedSignal();
+  return Dali::Toolkit::GetImpl(*this).InputStyleChangedSignal();
+}
+
+TextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal()
+{
+  return Dali::Toolkit::GetImpl(*this).ScrollStateChangedSignal();
 }
 
-TextEditor::TextEditor( Internal::TextEditor& implementation )
-: Control( implementation )
+TextEditor::TextEditor(Internal::TextEditor& implementation)
+: Control(implementation)
 {
 }
 
-TextEditor::TextEditor( Dali::Internal::CustomActor* internal )
-: Control( internal )
+TextEditor::TextEditor(Dali::Internal::CustomActor* internal)
+: Control(internal)
 {
-  VerifyCustomActorPointer<Internal::TextEditor>( internal );
+  VerifyCustomActorPointer<Internal::TextEditor>(internal);
 }
 
 } // namespace Toolkit