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 "DALi Version 1.0.43" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.h
diff --git
a/dali-toolkit/internal/text/text-controller-impl.h
b/dali-toolkit/internal/text/text-controller-impl.h
index
79792c9
..
3020e67
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-19,8
+19,8
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/
public
-api/text-abstraction/font-client.h>
-#include <dali/
public
-api/adaptor-framework/imf-manager.h>
+#include <dali/
devel
-api/text-abstraction/font-client.h>
+#include <dali/
devel
-api/adaptor-framework/imf-manager.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
@@
-274,7
+274,17
@@
struct Controller::Impl
}
}
}
}
- void PreEditReset()
+ void ClearPreEditFlag()
+ {
+ if( mEventData )
+ {
+ mEventData->mPreEditFlag = false;
+ mEventData->mPreEditStartPosition = 0;
+ mEventData->mPreEditLength = 0;
+ }
+ }
+
+ void ResetImfManager()
{
// Reset incase we are in a pre-edit state.
ImfManager imfManager = ImfManager::Get();
{
// Reset incase we are in a pre-edit state.
ImfManager imfManager = ImfManager::Get();
@@
-282,6
+292,8
@@
struct Controller::Impl
{
imfManager.Reset(); // Will trigger a commit message
}
{
imfManager.Reset(); // Will trigger a commit message
}
+
+ ClearPreEditFlag();
}
void UpdateModel( OperationsMask operationsRequired );
}
void UpdateModel( OperationsMask operationsRequired );