From d5ed30b895dd21c67023d8d1f4b21eefb814e457 Mon Sep 17 00:00:00 2001 From: Sungmin Kwak Date: Fri, 18 Sep 2015 15:34:11 +0900 Subject: [PATCH] Change the default value of candidate mode to SOFT_CANDIDATE_WINDOW Change-Id: Ie954f47da577f478bff772e242321f823ae20674 --- ism/extras/efl_immodule/isf_imf_context.cpp | 4 ++-- ism/extras/efl_panel/isf_panel_efl.cpp | 4 ++-- ism/src/scim_helper.h | 2 +- ism/src/scim_imengine.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 61537c8..2434f43 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -3579,7 +3579,7 @@ open_next_factory (EcoreIMFContextISF *ic) attach_instance (ic->impl->si); _backend->set_default_factory (_language, sf->get_uuid ()); _panel_client.register_input_context (ic->id, sf->get_uuid ()); - _panel_client.set_candidate_style (ic->id, ONE_LINE_CANDIDATE, FIXED_CANDIDATE_WINDOW); + _panel_client.set_candidate_style (ic->id, ONE_LINE_CANDIDATE, SOFT_CANDIDATE_WINDOW); set_ic_capabilities (ic); turn_on_ic (ic); @@ -3611,7 +3611,7 @@ open_previous_factory (EcoreIMFContextISF *ic) attach_instance (ic->impl->si); _backend->set_default_factory (_language, sf->get_uuid ()); _panel_client.register_input_context (ic->id, sf->get_uuid ()); - _panel_client.set_candidate_style (ic->id, ONE_LINE_CANDIDATE, FIXED_CANDIDATE_WINDOW); + _panel_client.set_candidate_style (ic->id, ONE_LINE_CANDIDATE, SOFT_CANDIDATE_WINDOW); set_ic_capabilities (ic); turn_on_ic (ic); diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index a6ba142..9509176 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -300,7 +300,7 @@ static bool _candidate_area_1_visible = false; static bool _candidate_area_2_visible = false; static bool _aux_area_visible = false; -static ISF_CANDIDATE_MODE_T _candidate_mode = FIXED_CANDIDATE_WINDOW; +static ISF_CANDIDATE_MODE_T _candidate_mode = SOFT_CANDIDATE_WINDOW; static ISF_CANDIDATE_PORTRAIT_LINE_T _candidate_port_line = ONE_LINE_CANDIDATE; static int _candidate_port_width = 480; @@ -1697,7 +1697,7 @@ static bool set_active_ise (const String &uuid, bool launch_ise) _ise_width = 0; _ise_height = 0; _ise_state = WINDOW_STATE_HIDE; - _candidate_mode = FIXED_CANDIDATE_WINDOW; + _candidate_mode = SOFT_CANDIDATE_WINDOW; _candidate_port_line = ONE_LINE_CANDIDATE; _soft_candidate_width = 0; _soft_candidate_height = 0; diff --git a/ism/src/scim_helper.h b/ism/src/scim_helper.h index 8a2ba6d..ae81827 100644 --- a/ism/src/scim_helper.h +++ b/ism/src/scim_helper.h @@ -663,7 +663,7 @@ public: * @param mode - candidate window mode. */ void set_candidate_style (ISF_CANDIDATE_PORTRAIT_LINE_T portrait_line = ONE_LINE_CANDIDATE, - ISF_CANDIDATE_MODE_T mode = FIXED_CANDIDATE_WINDOW) const; + ISF_CANDIDATE_MODE_T mode = SOFT_CANDIDATE_WINDOW) const; /** * @brief Request to reset keyboard ISE. diff --git a/ism/src/scim_imengine.h b/ism/src/scim_imengine.h index 20ea806..e04bd18 100644 --- a/ism/src/scim_imengine.h +++ b/ism/src/scim_imengine.h @@ -1052,7 +1052,7 @@ protected: * @param mode candidate window mode. */ void set_candidate_style (ISF_CANDIDATE_PORTRAIT_LINE_T portrait_line = ONE_LINE_CANDIDATE, - ISF_CANDIDATE_MODE_T mode = FIXED_CANDIDATE_WINDOW); + ISF_CANDIDATE_MODE_T mode = SOFT_CANDIDATE_WINDOW); void send_private_command (const String &command); -- 2.7.4