summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2019-06-19 20:23:22 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-06-19 20:23:22 +0900
commitc754a6bba652c4657d07820c143ea66172e09010 (patch)
tree4d4b5126f5419b37072be44287cbd2d24af491cc
parente712261e14c1b823c1766be56ac2d78baad6cdfc (diff)
efl_ui_clickable: testdevs/jaehyun/efl_clickable_test
-rw-r--r--src/bin/elementary/test_ui_active_view.c12
-rw-r--r--src/lib/elementary/efl_ui_active_view_view_manager_scroll.c3
2 files changed, 13 insertions, 2 deletions
diff --git a/src/bin/elementary/test_ui_active_view.c b/src/bin/elementary/test_ui_active_view.c
index 8f0d21febb..e59bc8cb86 100644
--- a/src/bin/elementary/test_ui_active_view.c
+++ b/src/bin/elementary/test_ui_active_view.c
@@ -58,6 +58,12 @@ typedef struct _Size_Params
58 58
59#define PAGE_NUM 3 59#define PAGE_NUM 3
60 60
61static void
62_cb(void *data, Evas_Object *obj, Evas *e, void *event_info)
63{
64 printf("asdfasdfasdf clicked\n");
65}
66
61static Eo * 67static Eo *
62view_add(View_Type p, Eo *parent) 68view_add(View_Type p, Eo *parent)
63{ 69{
@@ -93,8 +99,10 @@ view_add(View_Type p, Eo *parent)
93 break; 99 break;
94 100
95 case BUTTON: 101 case BUTTON:
96 page = efl_add(EFL_UI_BUTTON_CLASS, parent, 102 //page = efl_add(EFL_UI_BUTTON_CLASS, parent,
97 efl_text_set(efl_added, "Button Page")); 103 // efl_text_set(efl_added, "Button Page"));
104 page = elm_button_add(parent);
105 evas_object_smart_callback_add(page, "clicked", _cb, NULL);
98 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); 106 efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
99 break; 107 break;
100 108
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c b/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c
index 6918703cf1..fff3d851e2 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c
+++ b/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c
@@ -120,6 +120,9 @@ _mouse_move_cb(void *data,
120 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; 120 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return;
121 if (!pd->mouse_move.active) return; 121 if (!pd->mouse_move.active) return;
122 122
123 if (!efl_input_processed_get(ev))
124 efl_input_processed_set(ev, EINA_TRUE);
125
123 pos = efl_input_pointer_position_get(ev); 126 pos = efl_input_pointer_position_get(ev);
124 pos_y_diff = pd->mouse_move.mouse_start.x - pos.x; 127 pos_y_diff = pd->mouse_move.mouse_start.x - pos.x;
125 128