Fix clipboard show issue 33/100133/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 25 Nov 2016 06:59:24 +0000 (15:59 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 25 Nov 2016 06:59:24 +0000 (15:59 +0900)
Change-Id: Ibd56eebcff57a301829aba8d080c0ea3c4f8cbf7
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/ise.cpp

index 6911992..cf2603f 100644 (file)
@@ -897,6 +897,17 @@ on_input_mode_changed(const sclchar *key_value, sclulong key_event, sclint key_t
     return ret;
 }
 
+static void show_cbhm()
+{
+#ifdef HAVE_CBHM
+    int cbhm_ret = cbhm_show(cbhm_handle);
+    if (cbhm_ret != CBHM_ERROR_NONE)
+        LOGW("cbhm show error : %d\n", cbhm_ret);
+    else
+        LOGD("Show cbhm\n");
+#endif
+}
+
 SCLEventReturnType CUIEventCallback::on_event_notification(SCLUINotiType noti_type, SclNotiDesc *etc_info)
 {
     SCLEventReturnType ret = SCL_EVENT_PASS_ON;
@@ -1091,11 +1102,7 @@ SCLEventReturnType CUIEventCallback::on_event_key_clicked(SclUIEventDesc event_d
                     g_core.create_option_window();
                 ret = SCL_EVENT_DONE;
             } else if (strcmp(event_desc.key_value, USER_KEYSTRING_CLIPBOARD) == 0) {
-#ifdef HAVE_CBHM
-                int cbhm_ret = cbhm_show(cbhm_handle);
-                if (cbhm_ret != CBHM_ERROR_NONE)
-                    LOGW("cbhm show error : %d\n", cbhm_ret);
-#endif
+                show_cbhm();
 
                 ret = SCL_EVENT_DONE;
             } else if (on_input_mode_changed(event_desc.key_value, event_desc.key_event, event_desc.key_type)) {
@@ -1120,12 +1127,7 @@ SCLEventReturnType CUIEventCallback::on_event_key_clicked(SclUIEventDesc event_d
                     g_core.create_option_window();
                 ret = SCL_EVENT_DONE;
             } else if (strcmp(event_desc.key_value, USER_KEYSTRING_CLIPBOARD) == 0) {
-#ifdef HAVE_CBHM
-                int cbhm_ret = cbhm_hide(cbhm_handle);
-                if (cbhm_ret != CBHM_ERROR_NONE)
-                    LOGW("cbhm hide error : %d\n", cbhm_ret);
-#endif
-
+                show_cbhm();
                 ret = SCL_EVENT_DONE;
             } else if (strcmp(event_desc.key_value, "Cancel") == 0) {
                 ret = SCL_EVENT_DONE;