Modified not to use soft candidate

Change-Id: Iaa5764a0e55267ebd9c563a1b03a36cbf97f66c6

diff --git a/src/common.cpp b/src/common.cpp
index f419897..bb5c975 100644 (file)
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -289,7 +289,6 @@ void CISECommon::run(const sclchar *uuid, const scim::ConfigPointer &config, con
     elm_win_keyboard_win_set(m_main_window, EINA_TRUE);
     elm_win_autodel_set(m_main_window, EINA_TRUE);
     elm_win_title_set(m_main_window, "Tizen Keyboard");
-    evas_object_resize(m_main_window, 720, 444+CANDIDATE_WINDOW_HEIGHT);
     unsigned int set = 1;
     ecore_x_window_prop_card32_set(elm_win_xwindow_get(m_main_window),
         ECORE_X_ATOM_E_WINDOW_ROTATION_SUPPORTED,
@@ -342,9 +341,6 @@ void CISECommon::run(const sclchar *uuid, const scim::ConfigPointer &config, con
 
     Ecore_Event_Handler *XClientMsgHandler = ecore_event_handler_add (ECORE_X_EVENT_CLIENT_MESSAGE, _client_message_cb, m_main_window);
 
-    m_helper_agent.set_candidate_style(scim::ONE_LINE_CANDIDATE, scim::SOFT_CANDIDATE_WINDOW);
-    m_helper_agent.set_candidate_position(-1, -1);
-
     signal(SIGQUIT, signal_handler);
     signal(SIGTERM, signal_handler);
     signal(SIGINT,  signal_handler);
@@ -403,10 +399,10 @@ Evas_Object* CISECommon::get_main_window()
 void CISECommon::set_keyboard_size_hints(SclSize portrait, SclSize landscape)
 {
     /* Temporary code, this should be automatically calculated when changing input mode */
-    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window),   0, 0, 0, portrait.width, portrait.height+CANDIDATE_WINDOW_HEIGHT);
-    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window),  90, 0, 0, landscape.height+CANDIDATE_WINDOW_HEIGHT, landscape.width);
-    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window), 180, 0, 0, portrait.width, portrait.height+CANDIDATE_WINDOW_HEIGHT);
-    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window), 270, 0, 0, landscape.height+CANDIDATE_WINDOW_HEIGHT, landscape.width);
+    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window),   0, 0, 0, portrait.width, portrait.height);
+    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window),  90, 0, 0, landscape.height, landscape.width);
+    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window), 180, 0, 0, portrait.width, portrait.height);
+    ecore_x_e_window_rotation_geometry_set(elm_win_xwindow_get(m_main_window), 270, 0, 0, landscape.height, landscape.width);
 }
 
 scim::String CISECommon::get_keyboard_ise_uuid()

diff --git a/src/ise.cpp b/src/ise.cpp
index b66259d..97e2913 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -564,7 +564,6 @@ ise_create()
             if (!succeeded) {
                 gSCLUI->init((sclwindow)g_ise_common->get_main_window(), scl_parser_type, MAIN_ENTRY_XML_PATH);
             }
-            gSCLUI->set_custom_starting_coordinates(0, CANDIDATE_WINDOW_HEIGHT);
             // FIXME whether to use global var, need to check
             if (g_candidate == NULL) {
                 g_candidate = CandidateFactory::make_candidate(CANDIDATE_MULTILINE, g_ise_common->get_main_window());