Set default input method options for imf-manager

Change-Id: I5481351d38394632c06152353f0ffa63f6d0aac0

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index 6f10a2d..1b2c127 100755 (executable)
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -325,6 +325,7 @@ Dali::ImfManager ImfManager::Get()
 
   if ( ( imfManager != NULL ) && !imfManager->mInited )
   {
+    imfManager->SetDefaultOptions();
     imfManager->CreateContext( imfManager->mEcoreWlwin );
     imfManager->ConnectCallbacks();
     imfManager->mInited = true;
@@ -389,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()
 {
@@ -748,7 +760,6 @@ Rect<int> ImfManager::GetInputMethodArea()
 void ImfManager::ApplyOptions( const InputMethodOptions& options )
 {
   using namespace Dali::InputMethod::Category;
-
   int index;
 
   if (mIMFContext == NULL)

diff --git a/adaptors/ecore/wayland/imf-manager-impl.h b/adaptors/ecore/wayland/imf-manager-impl.h
index 623533a..391a896 100755 (executable)
--- a/adaptors/ecore/wayland/imf-manager-impl.h
+++ b/adaptors/ecore/wayland/imf-manager-impl.h
@@ -282,6 +282,11 @@ private:
    */
   void DeleteContext();
 
+  /**
+   * Set default input method options when context was re-created.
+   */
+  void SetDefaultOptions();
+
 private:
   // Undefined
   ImfManager( Ecore_Wl_Window *ecoreWlwin );