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 some properties into web view" into 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
c6fbe87
..
ce0bf59
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-event-handler.cpp
+++ b/
dali-toolkit/internal/text/text-controller-event-handler.cpp
@@
-287,7
+287,7
@@
bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE
(NULL != controller.mImpl->mEditableControlInterface))
{
// Do this last since it provides callbacks into application code
(NULL != controller.mImpl->mEditableControlInterface))
{
// Do this last since it provides callbacks into application code
- controller.mImpl->mEditableControlInterface->TextChanged();
+ controller.mImpl->mEditableControlInterface->TextChanged(
false
);
}
return true;
}
return true;
@@
-599,7
+599,8
@@
bool Controller::EventHandler::DeleteEvent(Controller& controller, int keyCode)
1,
UPDATE_INPUT_STYLE);
}
1,
UPDATE_INPUT_STYLE);
}
- else if(keyCode == Dali::DevelKey::DALI_KEY_DELETE)
+ else if((controller.mImpl->mEventData->mPrimaryCursorPosition < controller.mImpl->mModel->mLogicalModel->mText.Count()) &&
+ (keyCode == Dali::DevelKey::DALI_KEY_DELETE))
{
// Remove the character after the current cursor position
removed = controller.RemoveText(0,
{
// Remove the character after the current cursor position
removed = controller.RemoveText(0,
@@
-741,7
+742,7
@@
InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextE
(NULL != controller.mImpl->mEditableControlInterface))
{
// Do this last since it provides callbacks into application code
(NULL != controller.mImpl->mEditableControlInterface))
{
// Do this last since it provides callbacks into application code
- controller.mImpl->mEditableControlInterface->TextChanged();
+ controller.mImpl->mEditableControlInterface->TextChanged(
false
);
}
return callbackData;
}
return callbackData;
@@
-851,7
+852,7
@@
void Controller::EventHandler::TextPopupButtonTouched(Controller& controller, Da
if(NULL != controller.mImpl->mEditableControlInterface)
{
if(NULL != controller.mImpl->mEditableControlInterface)
{
- controller.mImpl->mEditableControlInterface->TextChanged();
+ controller.mImpl->mEditableControlInterface->TextChanged(
true
);
}
break;
}
}
break;
}