Return the candidate data at Mouse up event, then support flick event. if return...

Change-Id: I19948b959482961594ceb6c375065fc637113e13

diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate/efl/candidate-multiline-efl.cpp
index 3457e05..25cbb7a 100644 (file)
--- a/src/candidate/efl/candidate-multiline-efl.cpp
+++ b/src/candidate/efl/candidate-multiline-efl.cpp
@@ -45,28 +45,32 @@ using namespace std;
 #define IME_UI_RESOLUTION_H           1280
 #endif
 
+static bool               _item_click                         = true;
 extern CONFIG_VALUES g_config_values;
 
 static void
 _mouse_down(void *data, Evas *e,
     Evas_Object *button, void *event_info)
 {
-    EflMultiLineCandidate *candidate = (EflMultiLineCandidate *)data;
-    candidate->item_pressed(button);
+    _item_click = true;
 }
 
 static void
 _mouse_up(void *data, Evas *e,
     Evas_Object *button, void *event_info)
 {
-    //EflMultiLineCandidate *candidate = (EflMultiLineCandidate *)data;
+    if (_item_click) {
+        EflMultiLineCandidate *candidate = (EflMultiLineCandidate *)data;
+        candidate->item_pressed(button);
+        _item_click = false;
+    }
 }
 
 static void
 _mouse_move(void *data, Evas *e,
     Evas_Object *button, void *event_info)
 {
-    //EflMultiLineCandidate *candidate = (EflMultiLineCandidate *)data;
+    _item_click = false;
 }
 
 void
@@ -286,13 +290,14 @@ EflMultiLineCandidate::make_more_view()
     edje_object_file_set(m_candidateMoreScrollerBg, CANDIDATE_EDJ_FILE_PATH, "scroller_bg");
     evas_object_size_hint_weight_set(m_candidateMoreScrollerBg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_resize(m_candidateMoreScrollerBg, m_screenWidth, m_screenHeight-CANDIDATE_WINDOW_HEIGHT*m_screenRatio);
-    if (m_floating_mode)
+    if (m_floating_mode) {
         evas_object_move(m_candidateMoreScrollerBg, 0, (CANDIDATE_WINDOW_HEIGHT*m_screenRatio)+FLOATING_TITLE_BAR_HEIGHT);
-    else
+    } else {
         evas_object_move(m_candidateMoreScrollerBg, 0, CANDIDATE_WINDOW_HEIGHT*m_screenRatio);
+    }
 
     m_candidateMoreScroller = elm_scroller_add((Evas_Object*)m_window);
-    elm_scroller_bounce_set(m_candidateMoreScroller, EINA_FALSE, EINA_TRUE);
+    elm_scroller_bounce_set(m_candidateMoreScroller, EINA_TRUE, EINA_FALSE);
     elm_scroller_policy_set(m_candidateMoreScroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
     evas_object_resize(m_candidateMoreScroller, m_screenWidth, m_screenHeight-CANDIDATE_WINDOW_HEIGHT*m_screenRatio);
     if (m_floating_mode)
@@ -307,7 +312,7 @@ EflMultiLineCandidate::make_more_view()
     elm_object_content_set(m_candidateMoreScroller, m_candidateMoreTable);
 
     evas_object_layer_set(m_candidateMoreScrollerBg, 32000);
-    evas_object_layer_set(m_candidateMoreScroller, 32000);
+    evas_object_layer_set(m_candidateMoreScroller, 32001);
     evas_object_layer_set(m_candidateMoreTable, 32000);
 }