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
Fix for text cursor.
[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
e8df944
..
fc372af
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-1152,6
+1152,11
@@
bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
{
textChanged = BackspaceKeyEvent();
}
{
textChanged = BackspaceKeyEvent();
}
+ else if ( IsKey( keyEvent, Dali::DALI_KEY_POWER ) || IsKey( keyEvent, Dali::DALI_KEY_MENU ) )
+ {
+ // Do nothing when the Power or Menu Key is pressed.
+ // It avoids call the InsertText() method and delete the selected text.
+ }
else
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() );
else
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() );
@@
-1346,11
+1351,11
@@
void Controller::TapEvent( unsigned int tapCount, float x, float y )
mImpl->mEventData->mDecorator->SetPopupActive( false );
}
mImpl->mEventData->mDecorator->SetPopupActive( false );
}
- mImpl->ChangeState( EventData::EDITING );
-
// Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
if( mImpl->mEventData )
{
// Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
if( mImpl->mEventData )
{
+ mImpl->ChangeState( EventData::EDITING );
+
Event event( Event::TAP_EVENT );
event.p1.mUint = tapCount;
event.p2.mFloat = x;
Event event( Event::TAP_EVENT );
event.p1.mUint = tapCount;
event.p2.mFloat = x;