summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-27 13:52:37 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-27 20:19:22 +0100
commit98b4a7bfa74201cccacd62cb84230a194fa8c697 (patch)
treef769adb8120513d777f64d1534f561d366fa753a
parentb3327c761e7f80aa8c86605857f953c7af602b3d (diff)
elementary: remove unnecessessary disabled setter
summary_: those objects are disabled anyways, because disabled is applied to the objects in a tree. Which means, subobjects of a widget are disabled whenever the widget is disabled anyways. Depends on D8015 Reviewers: cedric, zmike, segfaultxavi, stefan_schmidt Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D8016
-rw-r--r--src/bin/elementary/test_ctxpopup.c3
-rw-r--r--src/lib/elementary/efl_ui_clock.c17
-rw-r--r--src/lib/elementary/efl_ui_clock.eo1
-rw-r--r--src/lib/elementary/elc_ctxpopup.c14
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c12
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo1
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo1
7 files changed, 2 insertions, 47 deletions
diff --git a/src/bin/elementary/test_ctxpopup.c b/src/bin/elementary/test_ctxpopup.c
index 9293647d28..f547f08951 100644
--- a/src/bin/elementary/test_ctxpopup.c
+++ b/src/bin/elementary/test_ctxpopup.c
@@ -39,10 +39,11 @@ _print_current_dir(Evas_Object *obj)
39} 39}
40 40
41static void 41static void
42_btn_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, 42_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
43 void *event_info EINA_UNUSED) 43 void *event_info EINA_UNUSED)
44{ 44{
45 printf("Button Clicked\n"); 45 printf("Button Clicked\n");
46 elm_object_disabled_set(data, !elm_object_disabled_get(data));
46} 47}
47 48
48static void 49static void
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 528e1f4727..e5a2eb9da1 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -496,23 +496,6 @@ _efl_ui_clock_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd
496 return EINA_TRUE; 496 return EINA_TRUE;
497} 497}
498 498
499EOLIAN static Eina_Bool
500_efl_ui_clock_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled)
501{
502 Clock_Field *field;
503 unsigned int idx = 0;
504
505 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
506 return EINA_FALSE;
507
508 for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++)
509 {
510 field = sd->field_list + idx;
511 elm_object_disabled_set(field->item_obj, disabled);
512 }
513 return EINA_TRUE;
514}
515
516EOLIAN static void 499EOLIAN static void
517_efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd) 500_efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
518{ 501{
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 767f8b2b7d..1d74ce4915 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -224,7 +224,6 @@ class @beta Efl.Ui.Clock extends Efl.Ui.Layout
224 implements { 224 implements {
225 Efl.Object.constructor; 225 Efl.Object.constructor;
226 Efl.Ui.Widget.theme_apply; 226 Efl.Ui.Widget.theme_apply;
227 Efl.Ui.Widget.on_disabled_update;
228 Efl.Ui.Focus.Object.on_focus_update; 227 Efl.Ui.Focus.Object.on_focus_update;
229 Efl.Ui.L10n.translation_update; 228 Efl.Ui.L10n.translation_update;
230 } 229 }
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index a7b743a4e1..1f6ed09737 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1027,20 +1027,6 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
1027 efl_destructor(efl_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS)); 1027 efl_destructor(efl_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
1028} 1028}
1029 1029
1030EOLIAN static Eina_Bool
1031_elm_ctxpopup_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
1032{
1033 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
1034 return EINA_FALSE;
1035
1036 if (sd->list)
1037 elm_object_disabled_set(sd->list, disabled);
1038 else if (sd->content)
1039 elm_object_disabled_set(sd->content, disabled);
1040
1041 return EINA_TRUE;
1042}
1043
1044EOLIAN static void 1030EOLIAN static void
1045_elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv) 1031_elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1046{ 1032{
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 0c0290ea88..02b22fe103 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -158,18 +158,6 @@ _elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entr
158 return int_ret; 158 return int_ret;
159} 159}
160 160
161EOLIAN static Eina_Bool
162_elm_fileselector_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
163{
164 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
165 return EINA_FALSE;
166
167 elm_widget_disabled_set(sd->button, disabled);
168 elm_widget_disabled_set(sd->entry, disabled);
169
170 return EINA_TRUE;
171}
172
173static Eina_Bool 161static Eina_Bool
174_elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label) 162_elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label)
175{ 163{
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index ea58d9fbe1..36bdd20732 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -232,7 +232,6 @@ class Elm.Ctxpopup extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Acce
232 class.constructor; 232 class.constructor;
233 Efl.Object.constructor; 233 Efl.Object.constructor;
234 Efl.Ui.Widget.widget_parent { set; } 234 Efl.Ui.Widget.widget_parent { set; }
235 Efl.Ui.Widget.on_disabled_update;
236 Efl.Ui.Widget.widget_sub_object_add; 235 Efl.Ui.Widget.widget_sub_object_add;
237 Efl.Ui.L10n.translation_update; 236 Efl.Ui.L10n.translation_update;
238 Efl.Ui.Widget.theme_apply; 237 Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index c9fdc6e6de..28484ca1cc 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -7,7 +7,6 @@ class Elm.Fileselector_Entry extends Efl.Ui.Layout implements Elm.Interface.File
7 class.constructor; 7 class.constructor;
8 Efl.Object.constructor; 8 Efl.Object.constructor;
9 Efl.Ui.Widget.theme_apply; 9 Efl.Ui.Widget.theme_apply;
10 Efl.Ui.Widget.on_disabled_update;
11 Elm.Interface.Fileselector.selected_model { get; set; } 10 Elm.Interface.Fileselector.selected_model { get; set; }
12 Elm.Interface.Fileselector.folder_only { get; set; } 11 Elm.Interface.Fileselector.folder_only { get; set; }
13 Elm.Interface.Fileselector.is_save { get; set; } 12 Elm.Interface.Fileselector.is_save { get; set; }