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
New with additional behavior flag for some Controls
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
text-controls
/
text-label.cpp
diff --git
a/dali-toolkit/public-api/controls/text-controls/text-label.cpp
b/dali-toolkit/public-api/controls/text-controls/text-label.cpp
index
7a61615
..
6591d8d
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-label.cpp
+++ b/
dali-toolkit/public-api/controls/text-controls/text-label.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
22
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.
@@
-23,59
+23,64
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
TextLabel TextLabel::New()
{
return Internal::TextLabel::New();
}
TextLabel TextLabel::New()
{
return Internal::TextLabel::New();
}
-TextLabel TextLabel::New(
const std::string& text
)
+TextLabel TextLabel::New(
const std::string& text
)
{
TextLabel label = Internal::TextLabel::New();
{
TextLabel label = Internal::TextLabel::New();
- label.SetProperty(
TextLabel::Property::TEXT, text
);
+ label.SetProperty(
TextLabel::Property::TEXT, text
);
return label;
}
return label;
}
-TextLabel
::TextLabel(
)
+TextLabel
TextLabel::New(ControlBehaviour additionalBehaviour
)
{
{
+ return Internal::TextLabel::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
}
}
-TextLabel::TextLabel( const TextLabel& handle )
-: Control( handle )
+TextLabel TextLabel::New(ControlBehaviour additionalBehaviour, const std::string& text)
{
{
+ TextLabel label = Internal::TextLabel::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+ label.SetProperty(TextLabel::Property::TEXT, text);
+
+ return label;
}
}
-TextLabel
& TextLabel::operator=( const TextLabel& handle
)
+TextLabel
::TextLabel(
)
{
{
- if( &handle != this )
- {
- Control::operator=( handle );
- }
- return *this;
}
}
+TextLabel::TextLabel(const TextLabel& handle) = default;
+
+TextLabel::TextLabel(TextLabel&& rhs) = default;
+
+TextLabel& TextLabel::operator=(const TextLabel& handle) = default;
+
+TextLabel& TextLabel::operator=(TextLabel&& rhs) = default;
+
TextLabel::~TextLabel()
{
}
TextLabel::~TextLabel()
{
}
-TextLabel TextLabel::DownCast(
BaseHandle handle
)
+TextLabel TextLabel::DownCast(
BaseHandle handle
)
{
return Control::DownCast<TextLabel, Internal::TextLabel>(handle);
}
{
return Control::DownCast<TextLabel, Internal::TextLabel>(handle);
}
-TextLabel::TextLabel(
Internal::TextLabel& implementation
)
+TextLabel::TextLabel(
Internal::TextLabel& implementation
)
: Control(implementation)
{
}
: Control(implementation)
{
}
-TextLabel::TextLabel(
Dali::Internal::CustomActor* internal
)
-: Control(
internal
)
+TextLabel::TextLabel(
Dali::Internal::CustomActor* internal
)
+: Control(
internal
)
{
{
- VerifyCustomActorPointer<Internal::TextLabel>(
internal
);
+ VerifyCustomActorPointer<Internal::TextLabel>(
internal
);
}
} // namespace Toolkit
}
} // namespace Toolkit