X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fecore%2Fwayland%2Fimf-manager-impl-ecore-wl.cpp;h=1b2c127b073cf6ec6abd5f325cabc60e65b8e95f;hb=70ecdb9d12cb4f471c59d08b78c90d15ca61d0e8;hp=51694ad9f2aa6d0f4d1d868d711cb9580640b463;hpb=d9418fed4fed3c286a9d14fc29c58663d7a2ec2f;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index 51694ad..1b2c127 100755
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -185,7 +185,7 @@ void InputPanelLanguageChangeCallback( void* data, Ecore_IMF_Context* context, i
   }
   ImfManager* imfManager = reinterpret_cast< ImfManager* > ( data );
   // Emit the signal that the language has changed
-  imfManager->LanguageChangedSignal().Emit();
+  imfManager->LanguageChangedSignal().Emit( value );
 }
 
 void InputPanelGeometryChangedCallback ( void *data, Ecore_IMF_Context *context, int value )
@@ -196,7 +196,7 @@ void InputPanelGeometryChangedCallback ( void *data, Ecore_IMF_Context *context,
   }
   ImfManager* imfManager = reinterpret_cast< ImfManager* > ( data );
   // Emit signal that the keyboard is resized
-  imfManager->ResizedSignal().Emit();
+  imfManager->ResizedSignal().Emit( value );
 }
 
 void InputPanelKeyboardTypeChangedCallback( void *data, Ecore_IMF_Context *context, int value )
@@ -265,7 +265,6 @@ void ImfManager::Finalize()
   {
     DisconnectCallbacks();
     DeleteContext();
-    ecore_imf_shutdown();
     mInited = false;
   }
 }
@@ -326,9 +325,8 @@ Dali::ImfManager ImfManager::Get()
 
   if ( ( imfManager != NULL ) && !imfManager->mInited )
   {
-    ecore_imf_init();
+    imfManager->SetDefaultOptions();
     imfManager->CreateContext( imfManager->mEcoreWlwin );
-
     imfManager->ConnectCallbacks();
     imfManager->mInited = true;
   }
@@ -345,11 +343,13 @@ ImfManager::ImfManager( Ecore_Wl_Window *ecoreWlwin )
   mRestoreAfterFocusLost( false ),
   mIdleCallbackConnected( false )
 {
+  ecore_imf_init();
 }
 
 ImfManager::~ImfManager()
 {
   Finalize();
+  ecore_imf_shutdown();
 }
 
 void ImfManager::CreateContext( Ecore_Wl_Window *ecoreWlwin )
@@ -390,6 +390,17 @@ void ImfManager::DeleteContext()
   }
 }
 
+void ImfManager::SetDefaultOptions()
+{
+  DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::SetDefaultOptions\n" );
+  Property::Map map;
+  map.Insert( "PANEL_LAYOUT", InputMethod::PanelLayout::NORMAL );
+  map.Insert( "AUTO_CAPITALISE", InputMethod::AutoCapital::SENTENCE );
+  map.Insert( "ACTION_BUTTON", InputMethod::ActionButtonTitle::DEFAULT );
+  map.Insert( "VARIATION", InputMethod::NormalLayout::NORMAL );
+  mOptions.ApplyProperty( map );
+}
+
 // Callbacks for predicitive text support.
 void ImfManager::ConnectCallbacks()
 {
@@ -749,7 +760,6 @@ Rect<int> ImfManager::GetInputMethodArea()
 void ImfManager::ApplyOptions( const InputMethodOptions& options )
 {
   using namespace Dali::InputMethod::Category;
-
   int index;
 
   if (mIMFContext == NULL)