projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24ea337
)
Add PRIVATECOMMAND of ImfEvent in text-controller
08/127508/2
author
Seoyeon Kim
<seoyeon2.kim@samsung.com>
Thu, 27 Apr 2017 13:10:38 +0000
(22:10 +0900)
committer
Seoyeon Kim
<seoyeon2.kim@samsung.com>
Thu, 27 Apr 2017 13:46:45 +0000
(22:46 +0900)
Change-Id: I00af8ca6913004bd90c58652ef34bc6a1fbce0e4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
patch
|
blob
|
history
dali-toolkit/internal/text/text-controller.cpp
patch
|
blob
|
history
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
index
d39a88f
..
c0a7076
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@
-241,6
+241,13
@@
int UtcDaliTextControllerImfEvent(void)
controller->GetText( text );
DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
controller->GetText( text );
DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
+ // Send PRIVATECOMMAND event
+ imfEvent = ImfManager::ImfEventData( ImfManager::PRIVATECOMMAND, "", 0, 0 );
+ controller->OnImfEvent( imfManager, imfEvent );
+
+ controller->GetText( text );
+ DALI_TEST_EQUALS( "Hello wo", text, TEST_LOCATION );
+
tet_result(TET_PASS);
END_TEST;
}
tet_result(TET_PASS);
END_TEST;
}
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
index
a777d95
..
392b580
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
@@
-53,7
+53,8
@@
public:
PREEDIT, ///< Pre-Edit changed
COMMIT, ///< Commit recieved
DELETESURROUNDING, ///< Event to delete a range of characters from the string
PREEDIT, ///< Pre-Edit changed
COMMIT, ///< Commit recieved
DELETESURROUNDING, ///< Event to delete a range of characters from the string
- GETSURROUNDING ///< Event to query string and cursor position
+ GETSURROUNDING, ///< Event to query string and cursor position
+ PRIVATECOMMAND ///< Private command sent from the input panel
};
/**
};
/**
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
5e40058
..
2811804
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-2148,6
+2148,13
@@
ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons
retrieveCursor = true;
break;
}
retrieveCursor = true;
break;
}
+ case ImfManager::PRIVATECOMMAND:
+ {
+ // PRIVATECOMMAND event is just for getting the private command message
+ retrieveText = true;
+ retrieveCursor = true;
+ break;
+ }
case ImfManager::VOID:
{
// do nothing
case ImfManager::VOID:
{
// do nothing