From: Haifeng Deng Date: Fri, 28 Aug 2015 02:45:45 +0000 (+0800) Subject: Add enable_soft_candidate () X-Git-Tag: submit/tizen/20150918.001611~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24a4a53f687aee6b19f5ca88c1c1b86379ac2740;p=platform%2Fcore%2Fuifw%2Flibscl-core.git Add enable_soft_candidate () Change-Id: I98b5d2d6b2236243ad333da52803dbfc945428b2 Signed-off-by: Haifeng Deng --- diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp index 96514eb..199c6a2 100644 --- 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 a31098f..2432933 100644 --- 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 77dd424..83226a5 100644 --- 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 bf9df23..c493078 100644 --- 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 aa17f15..839c7e3 100644 --- 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 521b165..38ace4b 100644 --- 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 de45bab..d6e4586 100644 --- 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 2a7d61f..447c553 100644 --- 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);