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
Refractor ImfManager to InputMethodContext
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
dali-toolkit-test-utils
/
toolkit-text-utils.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
9248151
..
7768344
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@
-357,8
+357,9
@@
void ConfigureTextLabel( ControllerPtr controller )
// Set cursor's width to zero.
controller->GetLayoutEngine().SetCursorWidth( 0 );
// Set cursor's width to zero.
controller->GetLayoutEngine().SetCursorWidth( 0 );
+ InputMethodContext inputMethodContext = InputMethodContext::New();
// Disables the text input.
// Disables the text input.
- controller->EnableTextInput( NULL );
+ controller->EnableTextInput( NULL
, inputMethodContext
);
// Disables the vertical scrolling.
controller->SetVerticalScrollEnabled( false );
// Disables the vertical scrolling.
controller->SetVerticalScrollEnabled( false );
@@
-382,8
+383,9
@@
void ConfigureTextField( ControllerPtr controller )
// Set the text layout as multi-line.
controller->GetLayoutEngine().SetLayout( Layout::Engine::SINGLE_LINE_BOX );
// Set the text layout as multi-line.
controller->GetLayoutEngine().SetLayout( Layout::Engine::SINGLE_LINE_BOX );
+ InputMethodContext inputMethodContext = InputMethodContext::New();
// Enables the text input.
// Enables the text input.
- controller->EnableTextInput( decorator );
+ controller->EnableTextInput( decorator
, inputMethodContext
);
// Enables the vertical scrolling after the text input has been enabled.
controller->SetVerticalScrollEnabled( false );
// Enables the vertical scrolling after the text input has been enabled.
controller->SetVerticalScrollEnabled( false );
@@
-410,8
+412,9
@@
void ConfigureTextEditor( ControllerPtr controller )
// Set the text layout as multi-line.
controller->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX );
// Set the text layout as multi-line.
controller->GetLayoutEngine().SetLayout( Layout::Engine::MULTI_LINE_BOX );
+ InputMethodContext inputMethodContext = InputMethodContext::New();
// Enables the text input.
// Enables the text input.
- controller->EnableTextInput( decorator );
+ controller->EnableTextInput( decorator
, inputMethodContext
);
// Enables the vertical scrolling after the text input has been enabled.
controller->SetVerticalScrollEnabled( true );
// Enables the vertical scrolling after the text input has been enabled.
controller->SetVerticalScrollEnabled( true );