diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-08-28 09:47:25 -0400 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-08-29 17:17:07 +0200 |
| commit | 0ef9228e5ff0b5b506ebb95136998463d6d0091c (patch) | |
| tree | 0de27995b8c220f5fc1166763fc02894ab93bf86 | |
| parent | a14fb05395ed6155535b419e4eddbc7d57d2675e (diff) | |
| download | efl-0ef9228e5ff0b5b506ebb95136998463d6d0091c.tar.gz | |
efl_ui/alert_popup: always create button layout
this can be safely done in the constructor without issues now
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D9785
| -rw-r--r-- | src/lib/elementary/efl_ui_alert_popup.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c index c671754be9..0edfff363d 100644 --- a/src/lib/elementary/efl_ui_alert_popup.c +++ b/src/lib/elementary/efl_ui_alert_popup.c @@ -188,16 +188,8 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler !!pd->button[EFL_UI_ALERT_POPUP_BUTTON_USER]; cur_content = efl_content_get(efl_part(obj, "efl.buttons")); - if (cur_content) - { - for (i = 0; i < EFL_UI_ALERT_POPUP_BUTTON_COUNT; i++) - efl_content_unset(efl_part(cur_content, BUTTON_SWALLOW_NAME[i])); - } - else - { - cur_content = efl_add(EFL_UI_LAYOUT_CLASS, obj, - efl_content_set(efl_part(obj, "efl.buttons"), efl_added)); - } + for (i = 0; i < EFL_UI_ALERT_POPUP_BUTTON_COUNT; i++) + efl_content_unset(efl_part(cur_content, BUTTON_SWALLOW_NAME[i])); elm_widget_element_update(obj, cur_content, PART_NAME_BUTTON_LAYOUT[btn_count - 1]); @@ -242,6 +234,9 @@ _efl_ui_alert_popup_efl_object_constructor(Eo *obj, obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); + efl_add(EFL_UI_LAYOUT_CLASS, obj, + efl_content_set(efl_part(obj, "efl.buttons"), efl_added)); + return obj; } |