summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 15:45:39 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-30 15:45:39 +0900
commit19657b6d255daf17088981a6fdec3b6a46b55a7b (patch)
treef77918f08e1c408e293fe733a5049cf1a4897416
parent05a29c965a81ba942fef1f7262e9c64a91ffa2f4 (diff)
ui: Fix build break due to eo api changes (input events)
-rw-r--r--src/bin/ui.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/ui.c b/src/bin/ui.c
index fad356f..4018f35 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -258,8 +258,8 @@ _ui_select(void)
258static void 258static void
259_ui_key(void *data EINA_UNUSED, const Eo_Event *event) 259_ui_key(void *data EINA_UNUSED, const Eo_Event *event)
260{ 260{
261 Efl_Event_Key *ev = event->info; 261 Efl_Input_Key *ev = event->info;
262 const char *keyname = efl_event_key_name_get(ev); 262 const char *keyname = efl_input_key_name_get(ev);
263 263
264 if (!keyname) return; 264 if (!keyname) return;
265 265
@@ -300,12 +300,12 @@ static int down_menu_sel = 0;
300static void 300static void
301_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event) 301_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
302{ 302{
303 Efl_Event_Pointer *ev = event->info; 303 Efl_Input_Pointer *ev = event->info;
304 304
305 if (efl_event_pointer_button_get(ev) != 1) return; 305 if (efl_input_pointer_button_get(ev) != 1) return;
306 if (menu_active) 306 if (menu_active)
307 { 307 {
308 efl_event_pointer_position_get(ev, &down_x, &down_y); 308 efl_input_pointer_position_get(ev, &down_x, &down_y);
309 down_menu_sel = menu_sel; 309 down_menu_sel = menu_sel;
310 } 310 }
311} 311}
@@ -313,14 +313,14 @@ _ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
313static void 313static void
314_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event) 314_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
315{ 315{
316 Efl_Event_Pointer *ev = event->info; 316 Efl_Input_Pointer *ev = event->info;
317 317
318 if (efl_event_pointer_button_get(ev) != 1) return; 318 if (efl_input_pointer_button_get(ev) != 1) return;
319 if (menu_active) 319 if (menu_active)
320 { 320 {
321 Evas_Coord dx, dy, x, y; 321 Evas_Coord dx, dy, x, y;
322 322
323 efl_event_pointer_position_get(ev, &x, &y); 323 efl_input_pointer_position_get(ev, &x, &y);
324 dx = x - down_x; 324 dx = x - down_x;
325 dy = y - down_y; 325 dy = y - down_y;
326 if ((((dx * dx) + (dy * dy)) < (20 * 20)) && 326 if ((((dx * dx) + (dy * dy)) < (20 * 20)) &&
@@ -337,14 +337,14 @@ _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
337static void 337static void
338_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event) 338_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event)
339{ 339{
340 Efl_Event_Pointer *ev = event->info; 340 Efl_Input_Pointer *ev = event->info;
341 341
342 if (efl_event_pointer_button_get(ev) != 1) return; 342 if (efl_input_pointer_button_get(ev) != 1) return;
343 if (menu_active) 343 if (menu_active)
344 { 344 {
345 Evas_Coord x; 345 Evas_Coord x;
346 346
347 efl_event_pointer_position_get(ev, &x, NULL); 347 efl_input_pointer_position_get(ev, &x, NULL);
348 menu_sel = down_menu_sel + ((x - down_x) / 25); 348 menu_sel = down_menu_sel + ((x - down_x) / 25);
349 /* scroll */ 349 /* scroll */
350 if (menu_sel < 0) menu_sel = 0; 350 if (menu_sel < 0) menu_sel = 0;