From b15f7ac2d98cffd186dfb7b175e8df988e787fc1 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Thu, 9 Feb 2017 14:33:57 +0000 Subject: [PATCH] Fix cursor display issue. * On resume after the power key is pressed the text controller is still in edit mode. When the power key is pressed, the text controller is set to the INACTIVE state. * @todo: Different applications may want a different behaviour on resume. Change-Id: I770b991bc0c141b5a2db260cf7ef7a693ead4b02 Signed-off-by: Victor Cebollada --- dali-toolkit/internal/text/text-controller.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index f10d93e..d02bc57 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1709,17 +1709,14 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { textChanged = BackspaceKeyEvent(); } - else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ) - { - mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode. - // Avoids calling the InsertText() method which can delete selected text - } - else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) || + else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) || + IsKey( keyEvent, Dali::DALI_KEY_MENU ) || IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) { + // Power key/Menu/Home key behaviour does not allow edit mode to resume. mImpl->ChangeState( EventData::INACTIVE ); - // Menu/Home key behaviour does not allow edit mode to resume like Power key - // Avoids calling the InsertText() method which can delete selected text + + // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text. } else if( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) { -- 2.7.4