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
[dali_2.1.25] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-event-handler.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-event-handler.cpp
b/dali-toolkit/internal/text/text-controller-event-handler.cpp
index
1d4be23
..
59f0b8d
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-event-handler.cpp
+++ b/
dali-toolkit/internal/text/text-controller-event-handler.cpp
@@
-336,6
+336,15
@@
bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE
controller.mImpl->RequestRelayout();
}
}
controller.mImpl->RequestRelayout();
}
}
+ else if((NULL != controller.mImpl->mEventData) && (keyEvent.GetState() == KeyEvent::UP))
+ {
+ // Handles specific keys that require event propagation.
+ if(Dali::DALI_KEY_BACK == keyEvent.GetKeyCode())
+ {
+ // Do nothing
+ return false;
+ }
+ }
if(textChanged &&
(NULL != controller.mImpl->mEditableControlInterface))
if(textChanged &&
(NULL != controller.mImpl->mEditableControlInterface))