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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / buttons / button.cpp

diff --git a/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp
index 1fbe69e..63c9b7d 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -1,93 +1,84 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/object/property-map.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/buttons/button-impl.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
-const char* const Button::SIGNAL_CLICKED = "clicked";
-
 Button::Button()
-{}
-
-Button::Button( const Button& button )
-: Control( button )
 {
 }
 
-Button& Button::operator=( const Button& button )
-{
-  if( &button != this )
-  {
-    Control::operator=( button );
-  }
-  return *this;
-}
+Button::Button(const Button& button) = default;
+
+Button::Button(Button&& rhs) noexcept = default;
+
+Button& Button::operator=(const Button& button) = default;
+
+Button& Button::operator=(Button&& rhs) noexcept = default;
 
 Button::~Button()
 {
 }
 
-Button Button::DownCast( BaseHandle handle )
+Button Button::DownCast(BaseHandle handle)
 {
   return Control::DownCast<Button, Internal::Button>(handle);
 }
 
-void Button::SetDimmed( bool dimmed )
-{
-  Dali::Toolkit::GetImplementation( *this ).SetDimmed( dimmed );
-}
-
-bool Button::IsDimmed() const
+Button::ButtonSignalType& Button::PressedSignal()
 {
-  return Dali::Toolkit::GetImplementation( *this ).IsDimmed();
+  return Dali::Toolkit::GetImplementation(*this).PressedSignal();
 }
 
-void Button::SetAnimationTime( float animationTime )
+Button::ButtonSignalType& Button::ReleasedSignal()
 {
-  Dali::Toolkit::GetImplementation( *this ).SetAnimationTime( animationTime );
+  return Dali::Toolkit::GetImplementation(*this).ReleasedSignal();
 }
 
-float Button::GetAnimationTime() const
+Button::ButtonSignalType& Button::ClickedSignal()
 {
-  return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
+  return Dali::Toolkit::GetImplementation(*this).ClickedSignal();
 }
 
-Button::ClickedSignalV2& Button::ClickedSignal()
+Button::ButtonSignalType& Button::StateChangedSignal()
 {
-  return Dali::Toolkit::GetImplementation( *this ).ClickedSignal();
+  return Dali::Toolkit::GetImplementation(*this).StateChangedSignal();
 }
 
-Button::Button( Internal::Button& implementation )
-: Control( implementation )
+Button::Button(Internal::Button& implementation)
+: Control(implementation)
 {
 }
 
-Button::Button( Dali::Internal::CustomActor* internal )
-: Control( internal )
+Button::Button(Dali::Internal::CustomActor* internal)
+: Control(internal)
 {
   VerifyCustomActorPointer<Internal::Button>(internal);
 }