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
Merge "Add support for new accessibility actions" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.cpp
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
52c64dd
..
b55a543
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-1500,7
+1500,7
@@
void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt
{
std::string stringToPaste("");
mImpl->GetTextFromClipboard( 0, stringToPaste ); // Paste latest item from system clipboard
{
std::string stringToPaste("");
mImpl->GetTextFromClipboard( 0, stringToPaste ); // Paste latest item from system clipboard
- InsertText( stringToPaste, Text::Controller::C
LIPBOARD
);
+ InsertText( stringToPaste, Text::Controller::C
OMMIT
);
mImpl->ChangeState( EventData::EDITING );
mImpl->RequestRelayout();
break;
mImpl->ChangeState( EventData::EDITING );
mImpl->RequestRelayout();
break;