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
Modify to get the encoded offset in UTF8
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
input
/
windows
/
input-method-context-impl-win.cpp
diff --git
a/dali/internal/input/windows/input-method-context-impl-win.cpp
b/dali/internal/input/windows/input-method-context-impl-win.cpp
index
4cd4b65
..
b673e4b
100755
(executable)
--- a/
dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/
dali/internal/input/windows/input-method-context-impl-win.cpp
@@
-1,5
+1,5
@@
/*
\r
/*
\r
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
\r
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
\r
*
\r
* Licensed under the Apache License, Version 2.0 (the "License");
\r
* you may not use this file except in compliance with the License.
\r
*
\r
* Licensed under the Apache License, Version 2.0 (the "License");
\r
* you may not use this file except in compliance with the License.
\r
@@
-20,17
+20,17
@@
\r
// EXTERNAL INCLUDES
\r
#include <dali/public-api/events/key-event.h>
\r
\r
// EXTERNAL INCLUDES
\r
#include <dali/public-api/events/key-event.h>
\r
-#include <dali/public-api/adaptor-framework/key.h>
\r
#include <dali/public-api/object/type-registry.h>
\r
#include <dali/integration-api/debug.h>
\r
\r
// INTERNAL INCLUDES
\r
#include <dali/public-api/object/type-registry.h>
\r
#include <dali/integration-api/debug.h>
\r
\r
// INTERNAL INCLUDES
\r
-#include <dali/integration-api/adaptor.h>
\r
+#include <dali/public-api/adaptor-framework/key.h>
\r
+#include <dali/integration-api/adaptor-framework/adaptor.h>
\r
#include <dali/internal/adaptor/common/adaptor-impl.h>
\r
#include <dali/internal/adaptor/common/adaptor-impl.h>
\r
+#include <dali/internal/input/common/key-impl.h>
\r
+#include <dali/internal/input/common/virtual-keyboard-impl.h>
\r
#include <dali/internal/system/common/locale-utils.h>
\r
#include <dali/internal/system/common/singleton-service-impl.h>
\r
#include <dali/internal/system/common/locale-utils.h>
\r
#include <dali/internal/system/common/singleton-service-impl.h>
\r
-#include <dali/internal/input/common/virtual-keyboard-impl.h>
\r
-#include <dali/internal/input/common/key-impl.h>
\r
\r
namespace Dali
\r
{
\r
\r
namespace Dali
\r
{
\r
@@
-41,6
+41,13
@@
namespace Internal
namespace Adaptor
\r
{
\r
\r
namespace Adaptor
\r
{
\r
\r
+namespace
\r
+{
\r
+#if defined(DEBUG_ENABLED)
\r
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_INPUT_METHOD_CONTEXT" );
\r
+#endif
\r
+}
\r
+
\r
InputMethodContextPtr InputMethodContextWin::New( Dali::Actor actor )
\r
{
\r
InputMethodContextPtr manager;
\r
InputMethodContextPtr InputMethodContextWin::New( Dali::Actor actor )
\r
{
\r
InputMethodContextPtr manager;
\r
@@
-62,8
+69,7
@@
InputMethodContextWin::InputMethodContextWin( Dali::Actor actor )
mIMFCursorPosition( 0 ),
\r
mSurroundingText(),
\r
mRestoreAfterFocusLost( false ),
\r
mIMFCursorPosition( 0 ),
\r
mSurroundingText(),
\r
mRestoreAfterFocusLost( false ),
\r
- mIdleCallbackConnected( false ),
\r
- mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE )
\r
+ mIdleCallbackConnected( false )
\r
{
\r
\r
actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged );
\r
{
\r
\r
actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged );
\r
@@
-365,10
+371,10
@@
void InputMethodContextWin::SetInputPanelPosition( unsigned int x, unsigned int
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" );
\r
}
\r
\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" );
\r
}
\r
\r
-
Dali::InputMethodContext::PreeditStyle InputMethodContextWin::GetPreeditStyle(
) const
\r
+
void InputMethodContextWin::GetPreeditStyle( Dali::InputMethodContext::PreEditAttributeDataContainer& attrs
) const
\r
{
\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" );
\r
{
\r
DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" );
\r
-
return mPreeditType
;
\r
+
attrs = mPreeditAttrs
;
\r
}
\r
\r
bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )
\r
}
\r
\r
bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )
\r