summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangHyeon Lee <sh10233.lee@samsung.com>2018-04-28 14:03:50 +0900
committerSangHyeon Lee <sh10233.lee@samsung.com>2018-04-28 14:03:54 +0900
commitb64522e848bd472b6f88d58c85ef8e333852800e (patch)
tree073a5aeafc4d034a6fcbc4dc91a4b3b8b24da69f
parent75f21087f57ac836fa28556239fafe2669696289 (diff)
efl.ui.view_list : fix signal prefix elm to efl
by the patch 6e49db0739c38a378c48c6c880f5b41c986ee1e9 efl.ui interface change signal prefix legacy elm to efl. this patch is fixing efl.ui.view.list scroller issue
-rw-r--r--src/lib/elementary/efl_ui_view_list.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c
index c69e95ab5c..e467f54d06 100644
--- a/src/lib/elementary/efl_ui_view_list.c
+++ b/src/lib/elementary/efl_ui_view_list.c
@@ -302,9 +302,9 @@ _efl_ui_view_list_bar_read_and_update(Eo *obj)
302 double vx, vy; 302 double vx, vy;
303 303
304 edje_object_part_drag_value_get 304 edje_object_part_drag_value_get
305 (wd->resize_obj, "elm.dragable.vbar", NULL, &vy); 305 (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
306 edje_object_part_drag_value_get 306 edje_object_part_drag_value_get
307 (wd->resize_obj, "elm.dragable.hbar", &vx, NULL); 307 (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
308 308
309 efl_ui_scrollbar_bar_position_set(pd->scrl_mgr, vx, vy); 309 efl_ui_scrollbar_bar_position_set(pd->scrl_mgr, vx, vy);
310 310
@@ -441,8 +441,8 @@ _efl_ui_view_list_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UN
441 441
442 efl_ui_scrollbar_bar_size_get(pd->scrl_mgr, &width, &height); 442 efl_ui_scrollbar_bar_size_get(pd->scrl_mgr, &width, &height);
443 443
444 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.hbar", width, 1.0); 444 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
445 edje_object_part_drag_size_set(wd->resize_obj, "elm.dragable.vbar", 1.0, height); 445 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
446} 446}
447 447
448static void 448static void
@@ -456,8 +456,8 @@ _efl_ui_view_list_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNU
456 456
457 efl_ui_scrollbar_bar_position_get(pd->scrl_mgr, &posx, &posy); 457 efl_ui_scrollbar_bar_position_get(pd->scrl_mgr, &posx, &posy);
458 458
459 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.hbar", posx, 0.0); 459 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
460 edje_object_part_drag_value_set(wd->resize_obj, "elm.dragable.vbar", 0.0, posy); 460 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
461} 461}
462 462
463static void 463static void
@@ -468,9 +468,9 @@ _efl_ui_view_list_bar_show_cb(void *data, const Efl_Event *event)
468 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 468 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
469 469
470 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 470 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
471 edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); 471 edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
472 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 472 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
473 edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); 473 edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
474} 474}
475 475
476static void 476static void
@@ -481,9 +481,9 @@ _efl_ui_view_list_bar_hide_cb(void *data, const Efl_Event *event)
481 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 481 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
482 482
483 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 483 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
484 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); 484 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
485 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 485 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
486 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); 486 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
487} 487}
488 488
489EOLIAN static Eina_Bool 489EOLIAN static Eina_Bool
@@ -512,57 +512,57 @@ static void
512_efl_ui_view_list_edje_object_attach(Eo *obj) 512_efl_ui_view_list_edje_object_attach(Eo *obj)
513{ 513{
514 efl_layout_signal_callback_add 514 efl_layout_signal_callback_add
515 (obj, "reload", "elm", _efl_ui_view_list_reload_cb, obj); 515 (obj, "reload", "efl", _efl_ui_view_list_reload_cb, obj);
516 //Vertical bar 516 //Vertical bar
517 efl_layout_signal_callback_add 517 efl_layout_signal_callback_add
518 (obj, "drag", "elm.dragable.vbar", _efl_ui_view_list_vbar_drag_cb, 518 (obj, "drag", "efl.dragable.vbar", _efl_ui_view_list_vbar_drag_cb,
519 obj); 519 obj);
520 efl_layout_signal_callback_add 520 efl_layout_signal_callback_add
521 (obj, "drag,set", "elm.dragable.vbar", 521 (obj, "drag,set", "efl.dragable.vbar",
522 _efl_ui_view_list_edje_drag_cb, obj); 522 _efl_ui_view_list_edje_drag_cb, obj);
523 efl_layout_signal_callback_add 523 efl_layout_signal_callback_add
524 (obj, "drag,start", "elm.dragable.vbar", 524 (obj, "drag,start", "efl.dragable.vbar",
525 _efl_ui_view_list_edje_drag_start_cb, obj); 525 _efl_ui_view_list_edje_drag_start_cb, obj);
526 efl_layout_signal_callback_add 526 efl_layout_signal_callback_add
527 (obj, "drag,stop", "elm.dragable.vbar", 527 (obj, "drag,stop", "efl.dragable.vbar",
528 _efl_ui_view_list_edje_drag_stop_cb, obj); 528 _efl_ui_view_list_edje_drag_stop_cb, obj);
529 efl_layout_signal_callback_add 529 efl_layout_signal_callback_add
530 (obj, "drag,step", "elm.dragable.vbar", 530 (obj, "drag,step", "efl.dragable.vbar",
531 _efl_ui_view_list_edje_drag_cb, obj); 531 _efl_ui_view_list_edje_drag_cb, obj);
532 efl_layout_signal_callback_add 532 efl_layout_signal_callback_add
533 (obj, "drag,page", "elm.dragable.vbar", 533 (obj, "drag,page", "efl.dragable.vbar",
534 _efl_ui_view_list_edje_drag_cb, obj); 534 _efl_ui_view_list_edje_drag_cb, obj);
535 efl_layout_signal_callback_add 535 efl_layout_signal_callback_add
536 (obj, "elm,vbar,press", "elm", 536 (obj, "efl,vbar,press", "efl",
537 _efl_ui_view_list_vbar_press_cb, obj); 537 _efl_ui_view_list_vbar_press_cb, obj);
538 efl_layout_signal_callback_add 538 efl_layout_signal_callback_add
539 (obj, "elm,vbar,unpress", "elm", 539 (obj, "efl,vbar,unpress", "efl",
540 _efl_ui_view_list_vbar_unpress_cb, obj); 540 _efl_ui_view_list_vbar_unpress_cb, obj);
541 541
542 //Horizontal bar 542 //Horizontal bar
543 efl_layout_signal_callback_add 543 efl_layout_signal_callback_add
544 (obj, "drag", "elm.dragable.hbar", _efl_ui_view_list_hbar_drag_cb, 544 (obj, "drag", "efl.dragable.hbar", _efl_ui_view_list_hbar_drag_cb,
545 obj); 545 obj);
546 efl_layout_signal_callback_add 546 efl_layout_signal_callback_add
547 (obj, "drag,set", "elm.dragable.hbar", 547 (obj, "drag,set", "efl.dragable.hbar",
548 _efl_ui_view_list_edje_drag_cb, obj); 548 _efl_ui_view_list_edje_drag_cb, obj);
549 efl_layout_signal_callback_add 549 efl_layout_signal_callback_add
550 (obj, "drag,start", "elm.dragable.hbar", 550 (obj, "drag,start", "efl.dragable.hbar",
551 _efl_ui_view_list_edje_drag_start_cb, obj); 551 _efl_ui_view_list_edje_drag_start_cb, obj);
552 efl_layout_signal_callback_add 552 efl_layout_signal_callback_add
553 (obj, "drag,stop", "elm.dragable.hbar", 553 (obj, "drag,stop", "efl.dragable.hbar",
554 _efl_ui_view_list_edje_drag_stop_cb, obj); 554 _efl_ui_view_list_edje_drag_stop_cb, obj);
555 efl_layout_signal_callback_add 555 efl_layout_signal_callback_add
556 (obj, "drag,step", "elm.dragable.hbar", 556 (obj, "drag,step", "efl.dragable.hbar",
557 _efl_ui_view_list_edje_drag_cb, obj); 557 _efl_ui_view_list_edje_drag_cb, obj);
558 efl_layout_signal_callback_add 558 efl_layout_signal_callback_add
559 (obj, "drag,page", "elm.dragable.hbar", 559 (obj, "drag,page", "efl.dragable.hbar",
560 _efl_ui_view_list_edje_drag_cb, obj); 560 _efl_ui_view_list_edje_drag_cb, obj);
561 efl_layout_signal_callback_add 561 efl_layout_signal_callback_add
562 (obj, "elm,hbar,press", "elm", 562 (obj, "efl,hbar,press", "efl",
563 _efl_ui_view_list_hbar_press_cb, obj); 563 _efl_ui_view_list_hbar_press_cb, obj);
564 efl_layout_signal_callback_add 564 efl_layout_signal_callback_add
565 (obj, "elm,hbar,unpress", "elm", 565 (obj, "efl,hbar,unpress", "efl",
566 _efl_ui_view_list_hbar_unpress_cb, obj); 566 _efl_ui_view_list_hbar_unpress_cb, obj);
567} 567}
568 568
@@ -570,57 +570,57 @@ static void
570_efl_ui_view_list_edje_object_detach(Evas_Object *obj) 570_efl_ui_view_list_edje_object_detach(Evas_Object *obj)
571{ 571{
572 efl_layout_signal_callback_del 572 efl_layout_signal_callback_del
573 (obj, "reload", "elm", _efl_ui_view_list_reload_cb, obj); 573 (obj, "reload", "efl", _efl_ui_view_list_reload_cb, obj);
574 //Vertical bar 574 //Vertical bar
575 efl_layout_signal_callback_del 575 efl_layout_signal_callback_del
576 (obj, "drag", "elm.dragable.vbar", _efl_ui_view_list_vbar_drag_cb, 576 (obj, "drag", "efl.dragable.vbar", _efl_ui_view_list_vbar_drag_cb,
577 obj); 577 obj);
578 efl_layout_signal_callback_del 578 efl_layout_signal_callback_del
579 (obj, "drag,set", "elm.dragable.vbar", 579 (obj, "drag,set", "efl.dragable.vbar",
580 _efl_ui_view_list_edje_drag_cb, obj); 580 _efl_ui_view_list_edje_drag_cb, obj);
581 efl_layout_signal_callback_del 581 efl_layout_signal_callback_del
582 (obj, "drag,start", "elm.dragable.vbar", 582 (obj, "drag,start", "efl.dragable.vbar",
583 _efl_ui_view_list_edje_drag_start_cb, obj); 583 _efl_ui_view_list_edje_drag_start_cb, obj);
584 efl_layout_signal_callback_del 584 efl_layout_signal_callback_del
585 (obj, "drag,stop", "elm.dragable.vbar", 585 (obj, "drag,stop", "efl.dragable.vbar",
586 _efl_ui_view_list_edje_drag_stop_cb, obj); 586 _efl_ui_view_list_edje_drag_stop_cb, obj);
587 efl_layout_signal_callback_del 587 efl_layout_signal_callback_del
588 (obj, "drag,step", "elm.dragable.vbar", 588 (obj, "drag,step", "efl.dragable.vbar",
589 _efl_ui_view_list_edje_drag_cb, obj); 589 _efl_ui_view_list_edje_drag_cb, obj);
590 efl_layout_signal_callback_del 590 efl_layout_signal_callback_del
591 (obj, "drag,page", "elm.dragable.vbar", 591 (obj, "drag,page", "efl.dragable.vbar",
592 _efl_ui_view_list_edje_drag_cb, obj); 592 _efl_ui_view_list_edje_drag_cb, obj);
593 efl_layout_signal_callback_del 593 efl_layout_signal_callback_del
594 (obj, "elm,vbar,press", "elm", 594 (obj, "efl,vbar,press", "efl",
595 _efl_ui_view_list_vbar_press_cb, obj); 595 _efl_ui_view_list_vbar_press_cb, obj);
596 efl_layout_signal_callback_del 596 efl_layout_signal_callback_del
597 (obj, "elm,vbar,unpress", "elm", 597 (obj, "efl,vbar,unpress", "efl",
598 _efl_ui_view_list_vbar_unpress_cb, obj); 598 _efl_ui_view_list_vbar_unpress_cb, obj);
599 599
600 //Horizontal bar 600 //Horizontal bar
601 efl_layout_signal_callback_del 601 efl_layout_signal_callback_del
602 (obj, "drag", "elm.dragable.hbar", _efl_ui_view_list_hbar_drag_cb, 602 (obj, "drag", "efl.dragable.hbar", _efl_ui_view_list_hbar_drag_cb,
603 obj); 603 obj);
604 efl_layout_signal_callback_del 604 efl_layout_signal_callback_del
605 (obj, "drag,set", "elm.dragable.hbar", 605 (obj, "drag,set", "efl.dragable.hbar",
606 _efl_ui_view_list_edje_drag_cb, obj); 606 _efl_ui_view_list_edje_drag_cb, obj);
607 efl_layout_signal_callback_del 607 efl_layout_signal_callback_del
608 (obj, "drag,start", "elm.dragable.hbar", 608 (obj, "drag,start", "efl.dragable.hbar",
609 _efl_ui_view_list_edje_drag_start_cb, obj); 609 _efl_ui_view_list_edje_drag_start_cb, obj);
610 efl_layout_signal_callback_del 610 efl_layout_signal_callback_del
611 (obj, "drag,stop", "elm.dragable.hbar", 611 (obj, "drag,stop", "efl.dragable.hbar",
612 _efl_ui_view_list_edje_drag_stop_cb, obj); 612 _efl_ui_view_list_edje_drag_stop_cb, obj);
613 efl_layout_signal_callback_del 613 efl_layout_signal_callback_del
614 (obj, "drag,step", "elm.dragable.hbar", 614 (obj, "drag,step", "efl.dragable.hbar",
615 _efl_ui_view_list_edje_drag_cb, obj); 615 _efl_ui_view_list_edje_drag_cb, obj);
616 efl_layout_signal_callback_del 616 efl_layout_signal_callback_del
617 (obj, "drag,page", "elm.dragable.hbar", 617 (obj, "drag,page", "efl.dragable.hbar",
618 _efl_ui_view_list_edje_drag_cb, obj); 618 _efl_ui_view_list_edje_drag_cb, obj);
619 efl_layout_signal_callback_del 619 efl_layout_signal_callback_del
620 (obj, "elm,hbar,press", "elm", 620 (obj, "efl,hbar,press", "efl",
621 _efl_ui_view_list_hbar_press_cb, obj); 621 _efl_ui_view_list_hbar_press_cb, obj);
622 efl_layout_signal_callback_del 622 efl_layout_signal_callback_del
623 (obj, "elm,hbar,unpress", "elm", 623 (obj, "efl,hbar,unpress", "efl",
624 _efl_ui_view_list_hbar_unpress_cb, obj); 624 _efl_ui_view_list_hbar_unpress_cb, obj);
625} 625}
626 626
@@ -650,8 +650,8 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd)
650 efl_ui_scroll_manager_pan_set(pd->scrl_mgr, pd->pan_obj); 650 efl_ui_scroll_manager_pan_set(pd->scrl_mgr, pd->pan_obj);
651 efl_ui_scrollable_bounce_enabled_set(pd->scrl_mgr, bounce, bounce); 651 efl_ui_scrollable_bounce_enabled_set(pd->scrl_mgr, bounce, bounce);
652 652
653 edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", pd->pan_obj); 653 edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan_obj);
654 efl_gfx_stack_raise((Eo *)edje_object_part_object_get(wd->resize_obj, "elm.dragable.vbar")); 654 efl_gfx_stack_raise((Eo *)edje_object_part_object_get(wd->resize_obj, "efl.dragable.vbar"));
655 655
656 pd->mode = ELM_LIST_COMPRESS; 656 pd->mode = ELM_LIST_COMPRESS;
657 657