Add enable_soft_candidate ()

Change-Id: I98b5d2d6b2236243ad333da52803dbfc945428b2
Signed-off-by: Haifeng Deng <haifeng.deng@samsung.com>

diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp
index 96514eb1959e22e70b770aa4ea0d8cc4e2c68775..199c6a22499cae3789337a9e2d8ca7356d90996b 100644 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -928,6 +928,16 @@ void CSCLConnectionISF::set_candidate_position(sclint left, sclint top)
     }
 }
 
+void CSCLConnectionISF::enable_soft_candidate(sclboolean enable)
+{
+    if (m_initialized) {
+        if (enable)
+            m_helper_agent.set_candidate_style(scim::ONE_LINE_CANDIDATE, scim::SOFT_CANDIDATE_WINDOW);
+        else
+            m_helper_agent.set_candidate_style(scim::ONE_LINE_CANDIDATE, scim::FIXED_CANDIDATE_WINDOW);
+    }
+}
+
 void CSCLConnectionISF::candidate_hide(void)
 {
     if (m_initialized) {

diff --git a/src/sclconnection-isf.h b/src/sclconnection-isf.h
index a31098f9a64df0ee8b9783d22f94d954312da0df..243293324a7bbf3019603e79b1ef1b1aa3e53685 100644 (file)
--- a/src/sclconnection-isf.h
+++ b/src/sclconnection-isf.h
@@ -76,6 +76,7 @@ public:
     void get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     void delete_surrounding_text(sclint offset, sclint len) const;
     void set_candidate_position(sclint left, sclint top);
+    void enable_soft_candidate(sclboolean enable);
     void candidate_hide(void);
     void set_keyboard_ise_by_uuid(const sclchar *uuid);
     void get_keyboard_ise(const sclchar *uuid);

diff --git a/src/sclconnection.cpp b/src/sclconnection.cpp
index 77dd4242f5b474aedb4b34be603139edf776e298..83226a53a2b6e8f62951b0001f0e1714f74fb469 100644 (file)
--- a/src/sclconnection.cpp
+++ b/src/sclconnection.cpp
@@ -280,6 +280,13 @@ void CSCLConnection::set_candidate_position(sclint left, sclint top)
     }
 }
 
+void CSCLConnection::enable_soft_candidate(sclboolean enable)
+{
+    if (m_impl) {
+        m_impl->enable_soft_candidate(enable);
+    }
+}
+
 void CSCLConnection::candidate_hide(void)
 {
     if (m_impl) {

diff --git a/src/sclconnection.h b/src/sclconnection.h
index bf9df23fb768536f1922281fe45c71a52d817600..c493078c7a00c8243762178f19e33ec7979dc18b 100644 (file)
--- a/src/sclconnection.h
+++ b/src/sclconnection.h
@@ -76,6 +76,7 @@ public:
     virtual void get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     virtual void delete_surrounding_text(sclint offset, sclint len) const;
     virtual void set_candidate_position(sclint left, sclint top);
+    virtual void enable_soft_candidate(sclboolean enable);
     virtual void candidate_hide(void);
     virtual void set_keyboard_ise_by_uuid(const sclchar *uuid);
     virtual void get_keyboard_ise(const sclchar *uuid);

diff --git a/src/sclcore.cpp b/src/sclcore.cpp
index aa17f1560a375e4fecccac03ad8fe8647a92ee8c..839c7e35ee77afb6dcd4fde8980e0e7573f2885d 100644 (file)
--- a/src/sclcore.cpp
+++ b/src/sclcore.cpp
@@ -249,6 +249,13 @@ void CSCLCore::set_candidate_position(sclint left, sclint top)
     }
 }
 
+void CSCLCore::enable_soft_candidate(sclboolean enable)
+{
+    if (m_impl) {
+        m_impl->enable_soft_candidate(enable);
+    }
+}
+
 void CSCLCore::candidate_hide(void)
 {
     if (m_impl) {

diff --git a/src/sclcore.h b/src/sclcore.h
index 521b16546b6d29fe340746cb7ed7459570eb51c0..38ace4b5ba1b8a8f11323d97392859c3c5a24a7b 100644 (file)
--- a/src/sclcore.h
+++ b/src/sclcore.h
@@ -262,6 +262,13 @@ public:
      */
     void set_candidate_position(sclint left, sclint top);
 
+    /**
+     * @ brief Set soft candidate style.
+     *
+     * @param[in] enable The flag for soft candidate style.
+     */
+    void enable_soft_candidate(sclboolean enable);
+
     /**
      * @ brief Request to hide candidate window.
      */

diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp
index de45bab4fd8ca4e41063a20de520d94a8c8c0b42..d6e458682e931b8a98661ec87a73869c9e1c24ec 100644 (file)
--- a/src/sclcoreimpl.cpp
+++ b/src/sclcoreimpl.cpp
@@ -235,6 +235,11 @@ void CSCLCoreImpl::set_candidate_position(sclint left, sclint top)
     m_connection.set_candidate_position(left, top);
 }
 
+void CSCLCoreImpl::enable_soft_candidate(sclboolean enable)
+{
+    m_connection.enable_soft_candidate(enable);
+}
+
 void CSCLCoreImpl::candidate_hide(void)
 {
     m_connection.candidate_hide();

diff --git a/src/sclcoreimpl.h b/src/sclcoreimpl.h
index 2a7d61fa12d02175ed3734f93d31a3d1b15bfb3d..447c55370aa2c60bb6d949b63654a2ed3c39c7d8 100644 (file)
--- a/src/sclcoreimpl.h
+++ b/src/sclcoreimpl.h
@@ -84,6 +84,7 @@ public:
     void get_surrounding_text(const sclchar* ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     void delete_surrounding_text(sclint offset, sclint len) const;
     void set_candidate_position(sclint left, sclint top);
+    void enable_soft_candidate(sclboolean enable);
     void candidate_hide(void);
     //void get_candidate_window_geometry (const String           &uuid) const;
     void set_keyboard_ise_by_uuid(const sclchar *uuid);