projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix InputMethodContext to work well in multi-window env
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
input
/
windows
/
input-method-context-impl-win.h
diff --git
a/dali/internal/input/windows/input-method-context-impl-win.h
b/dali/internal/input/windows/input-method-context-impl-win.h
index
e1c1e33
..
a0eed9d
100755
(executable)
--- a/
dali/internal/input/windows/input-method-context-impl-win.h
+++ b/
dali/internal/input/windows/input-method-context-impl-win.h
@@
-37,21
+37,22
@@
namespace Internal
namespace Adaptor
\r
{
\r
\r
namespace Adaptor
\r
{
\r
\r
-class InputMethodContextWin : public Dali::Internal::Adaptor::InputMethodContext
\r
+class InputMethodContextWin : public Dali::Internal::Adaptor::InputMethodContext
, public Dali::ConnectionTracker
\r
{
\r
public:
\r
/**
\r
* @brief Creates a new InputMethodContext handle
\r
*
\r
{
\r
public:
\r
/**
\r
* @brief Creates a new InputMethodContext handle
\r
*
\r
+ * @param[in] actor The actor that uses the new InputMethodContext instance.
\r
* @return InputMethodContext pointer
\r
*/
\r
* @return InputMethodContext pointer
\r
*/
\r
- static InputMethodContextPtr New();
\r
+ static InputMethodContextPtr New(
Dali::Actor actor
);
\r
\r
/**
\r
* Constructor
\r
* @param[in] win32Window, The window is created by application.
\r
*/
\r
\r
/**
\r
* Constructor
\r
* @param[in] win32Window, The window is created by application.
\r
*/
\r
- explicit InputMethodContextWin(
WinWindowHandle win32Window
);
\r
+ explicit InputMethodContextWin(
Dali::Actor actor
);
\r
\r
public:
\r
\r
\r
public:
\r
\r
@@
-280,6
+281,11
@@
private:
*/
\r
bool ProcessEventKeyUp( const KeyEvent& keyEvent );
\r
\r
*/
\r
bool ProcessEventKeyUp( const KeyEvent& keyEvent );
\r
\r
+ /**
\r
+ * Called when the binded actor is added to a window.
\r
+ */
\r
+ void OnStaged( Dali::Actor actor );
\r
+
\r
public:
\r
\r
/**
\r
public:
\r
\r
/**
\r