summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2020-01-12 16:31:05 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-01-13 12:25:55 +0100
commit2201b562d019f021c93ca5fb408fcfca203d262d (patch)
tree624980cf67a327f94675d7bcf3d1065e05173500
parentd6649ad80a70a8d9e9d73c0cdd48ef4a459072a1 (diff)
efl.ui.textbox: legacy cleanup
efl.ui.textbox: legacy cleanup Differential Revision: https://phab.enlightenment.org/D11067
-rw-r--r--src/lib/elementary/efl_ui_textbox.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index 728c060adb..d88f6a432c 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -635,7 +635,7 @@ _efl_ui_textbox_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Ein
635 efl_layout_signal_emit(sd->entry_edje, emission, "efl"); 635 efl_layout_signal_emit(sd->entry_edje, emission, "efl");
636 if (sd->scroll) 636 if (sd->scroll)
637 { 637 {
638 elm_interface_scrollable_freeze_set(obj, efl_ui_widget_disabled_get(obj)); 638 efl_ui_scrollable_scroll_freeze_set(obj, efl_ui_widget_disabled_get(obj));
639 } 639 }
640 640
641 if (!efl_ui_widget_disabled_get(obj)) 641 if (!efl_ui_widget_disabled_get(obj))
@@ -681,7 +681,7 @@ _efl_ui_textbox_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textbox_Data *sd)
681 // elm_entry_cursor_pos_set -> cursor,changed -> widget_show_region_set 681 // elm_entry_cursor_pos_set -> cursor,changed -> widget_show_region_set
682 // -> smart_objects_calculate will call all smart calculate functions, 682 // -> smart_objects_calculate will call all smart calculate functions,
683 // and one of them can delete elm_entry. 683 // and one of them can delete elm_entry.
684 evas_object_ref(obj); 684 efl_ref(obj);
685 685
686 if (efl_ui_focus_object_focus_get(obj)) 686 if (efl_ui_focus_object_focus_get(obj))
687 { 687 {
@@ -705,7 +705,7 @@ _efl_ui_textbox_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textbox_Data *sd)
705 705
706 efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); 706 efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
707 707
708 evas_object_unref(obj); 708 efl_unref(obj);
709 709
710 return theme_apply; 710 return theme_apply;
711} 711}
@@ -1669,9 +1669,6 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Textbox_Data *sd)
1669EOLIAN static void 1669EOLIAN static void
1670_efl_ui_textbox_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Position2D pos) 1670_efl_ui_textbox_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Position2D pos)
1671{ 1671{
1672 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
1673 return;
1674
1675 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos); 1672 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
1676 efl_gfx_entity_position_set(sd->hit_rect, pos); 1673 efl_gfx_entity_position_set(sd->hit_rect, pos);
1677 1674
@@ -1681,9 +1678,6 @@ _efl_ui_textbox_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Ei
1681EOLIAN static void 1678EOLIAN static void
1682_efl_ui_textbox_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Size2D sz) 1679_efl_ui_textbox_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Size2D sz)
1683{ 1680{
1684 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
1685 return;
1686
1687 efl_gfx_entity_size_set(sd->hit_rect, sz); 1681 efl_gfx_entity_size_set(sd->hit_rect, sz);
1688 _update_selection_handler(obj); 1682 _update_selection_handler(obj);
1689 1683
@@ -1693,9 +1687,6 @@ _efl_ui_textbox_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_S
1693EOLIAN static void 1687EOLIAN static void
1694_efl_ui_textbox_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, Eina_Bool vis) 1688_efl_ui_textbox_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, Eina_Bool vis)
1695{ 1689{
1696 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
1697 return;
1698
1699 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis); 1690 efl_gfx_entity_visible_set(efl_super(obj, MY_CLASS), vis);
1700 if (vis) _update_selection_handler(obj); 1691 if (vis) _update_selection_handler(obj);
1701} 1692}