Merge changes Ic9dba03a,Id5ec87c1 into devel/master

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

diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp
index ec37028..2e918f0 100644 (file)
--- a/dali-toolkit/public-api/controls/control.cpp
+++ b/dali-toolkit/public-api/controls/control.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -31,7 +31,12 @@ namespace Toolkit
 {
 Control Control::New()
 {
-  return Internal::Control::New();
+  return Toolkit::Internal::Control::New();
+}
+
+Control Control::New(ControlBehaviour additionalBehaviour)
+{
+  return Toolkit::Internal::Control::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
 }
 
 Control::Control()
@@ -40,7 +45,7 @@ Control::Control()
 
 Control::Control(const Control& uiControl) = default;
 
-Control::Control(Control&& rhs) = default;
+Control::Control(Control&& rhs) noexcept = default;
 
 Control::~Control()
 {
@@ -48,7 +53,7 @@ Control::~Control()
 
 Control& Control::operator=(const Control& handle) = default;
 
-Control& Control::operator=(Control&& rhs) = default;
+Control& Control::operator=(Control&& rhs) noexcept = default;
 
 Control Control::DownCast(BaseHandle handle)
 {
@@ -112,10 +117,7 @@ void Control::ClearBackground()
 
 bool Control::IsResourceReady() const
 {
-  const Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(*this);
-  const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(internalControl);
-
-  return controlDataImpl.IsResourceReady();
+  return Internal::GetImplementation(*this).IsResourceReady();
 }
 
 Toolkit::Visual::ResourceStatus Control::GetVisualResourceStatus(Dali::Property::Index index)