[3.0] Notify multiline hint to IMF context

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ia570d16fb92ffb8a2e864c710f45a1a6230fe296

diff --git a/adaptors/devel-api/adaptor-framework/imf-manager.cpp b/adaptors/devel-api/adaptor-framework/imf-manager.cpp
index f083c8b..4410609 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/imf-manager.cpp
+++ b/adaptors/devel-api/adaptor-framework/imf-manager.cpp
@@ -88,6 +88,11 @@ const std::string& ImfManager::GetSurroundingText() const
   return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText();
 }
 
+void ImfManager::NotifyTextInputMultiLine( bool multiLine )
+{
+  Internal::Adaptor::ImfManager::GetImplementation(*this).NotifyTextInputMultiLine( multiLine );
+}
+
 ImfManager::ImfManagerSignalType& ImfManager::ActivatedSignal()
 {
   return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal();

diff --git a/adaptors/devel-api/adaptor-framework/imf-manager.h b/adaptors/devel-api/adaptor-framework/imf-manager.h
index a674ce7..dcc9e0c 100644 (file)
--- a/adaptors/devel-api/adaptor-framework/imf-manager.h
+++ b/adaptors/devel-api/adaptor-framework/imf-manager.h
@@ -211,6 +211,13 @@ public:
    */
   const std::string& GetSurroundingText() const;
 
+  /**
+ * @brief Notifies IMF context that text input is set to multi line or not
+ *
+ * @param[in] true if multiline text input is used
+ */
+  void NotifyTextInputMultiLine( bool multiLine );
+
 public:
 
   // Signals

diff --git a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
index 825b444..e88e30a 100644 (file)
--- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp
@@ -516,6 +516,14 @@ const std::string& ImfManager::GetSurroundingText() const
   return mSurroundingText;
 }
 
+void ImfManager::NotifyTextInputMultiLine( bool multiLine )
+{
+  Ecore_IMF_Input_Hints currentHint = ecore_imf_context_input_hint_get(mIMFContext);
+  ecore_imf_context_input_hint_set(mIMFContext, (Ecore_IMF_Input_Hints)(multiLine ?
+    (currentHint | ECORE_IMF_INPUT_HINT_MULTILINE) :
+    (currentHint & ~ECORE_IMF_INPUT_HINT_MULTILINE)));
+}
+
 } // Adaptor
 
 } // Internal

diff --git a/adaptors/ecore/wayland/imf-manager-impl.h b/adaptors/ecore/wayland/imf-manager-impl.h
index 1fd8e16..391c56d 100644 (file)
--- a/adaptors/ecore/wayland/imf-manager-impl.h
+++ b/adaptors/ecore/wayland/imf-manager-impl.h
@@ -151,6 +151,11 @@ public:
    */
   const std::string& GetSurroundingText() const;
 
+  /**
+  * @copydoc Dali::ImfManager::NotifyTextInputMultiLine()
+  */
+  void NotifyTextInputMultiLine( bool multiLine );
+
 public:  // Signals
 
   /**

diff --git a/adaptors/integration-api/x11/imf-manager-impl.h b/adaptors/integration-api/x11/imf-manager-impl.h
index 1791792..ea7fe87 100644 (file)
--- a/adaptors/integration-api/x11/imf-manager-impl.h
+++ b/adaptors/integration-api/x11/imf-manager-impl.h
@@ -154,6 +154,11 @@ public:
    */
   const std::string& GetSurroundingText() const;
 
+  /**
+  * @copydoc Dali::ImfManager::NotifyTextInputMultiLine()
+  */
+  void NotifyTextInputMultiLine( bool multiLine );
+
 public:  // Signals
 
   /**

diff --git a/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp b/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp
index ad95ac5..731763e 100644 (file)
--- a/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp
+++ b/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp
@@ -303,6 +303,10 @@ const std::string& ImfManager::GetSurroundingText() const
   return mSurroundingText;
 }
 
+void ImfManager::NotifyTextInputMultiLine( bool multiLine )
+{
+}
+
 } // Adaptor
 
 } // Internal

diff --git a/adaptors/wayland/input/text/imf/imf-manager-impl.h b/adaptors/wayland/input/text/imf/imf-manager-impl.h
index 7a0d287..1af41bc 100644 (file)
--- a/adaptors/wayland/input/text/imf/imf-manager-impl.h
+++ b/adaptors/wayland/input/text/imf/imf-manager-impl.h
@@ -148,6 +148,11 @@ public:
    */
   const std::string& GetSurroundingText() const;
 
+  /**
+  * @copydoc Dali::ImfManager::NotifyTextInputMultiLine()
+  */
+  void NotifyTextInputMultiLine( bool multiLine );
+
 public:  // Signals
 
   /**

diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp
index 57ffb35..14dc385 100644 (file)
--- a/adaptors/x11/imf-manager-impl-x.cpp
+++ b/adaptors/x11/imf-manager-impl-x.cpp
@@ -516,6 +516,10 @@ const std::string& ImfManager::GetSurroundingText() const
   return mSurroundingText;
 }
 
+void ImfManager::NotifyTextInputMultiLine( bool multiLine )
+{
+}
+
 } // Adaptor
 
 } // Internal