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
Remove unnecessray Clipboard creation in text controller
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
controller
/
text-controller-impl.h
diff --git
a/dali-toolkit/internal/text/controller/text-controller-impl.h
b/dali-toolkit/internal/text/controller/text-controller-impl.h
index
faa8772
..
ba67b39
100644
(file)
--- a/
dali-toolkit/internal/text/controller/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/controller/text-controller-impl.h
@@
-370,7
+370,10
@@
struct Controller::Impl
mModel = Model::New();
mFontClient = TextAbstraction::FontClient::Get();
mModel = Model::New();
mFontClient = TextAbstraction::FontClient::Get();
- mClipboard = Clipboard::Get();
+ if(mEditableControlInterface != nullptr && Clipboard::IsAvailable())
+ {
+ mClipboard = Clipboard::Get();
+ }
mView.SetVisualModel(mModel->mVisualModel);
mView.SetLogicalModel(mModel->mLogicalModel);
mView.SetVisualModel(mModel->mVisualModel);
mView.SetLogicalModel(mModel->mLogicalModel);
@@
-551,15
+554,25
@@
struct Controller::Impl
*/
void GetText(CharacterIndex index, std::string& text) const;
*/
void GetText(CharacterIndex index, std::string& text) const;
+ bool EnsureClipboardCreated()
+ {
+ if(!mClipboard)
+ {
+ mClipboard = Clipboard::Get();
+ }
+
+ return mClipboard != nullptr ? true : false;
+ }
+
bool IsClipboardEmpty()
{
bool IsClipboardEmpty()
{
- bool result(
mClipboard
&& mClipboard.NumberOfItems());
+ bool result(
Clipboard::IsAvailable() && EnsureClipboardCreated()
&& mClipboard.NumberOfItems());
return !result; // If NumberOfItems greater than 0, return false
}
bool IsClipboardVisible()
{
return !result; // If NumberOfItems greater than 0, return false
}
bool IsClipboardVisible()
{
- bool result(
mClipboard
&& mClipboard.IsVisible());
+ bool result(
Clipboard::IsAvailable() && EnsureClipboardCreated()
&& mClipboard.IsVisible());
return result;
}
return result;
}