summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elc_popup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/elc_popup.c')
-rw-r--r--src/lib/elementary/elc_popup.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 8c4684e..7c011b7 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -365,7 +365,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd)
365 sd->theme_scroll = EINA_FALSE; 365 sd->theme_scroll = EINA_FALSE;
366} 366}
367 367
368EOLIAN static Efl_Ui_Theme_Apply_Result 368EOLIAN static Eina_Error
369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) 369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
370{ 370{
371 Elm_Popup_Item_Data *it; 371 Elm_Popup_Item_Data *it;
@@ -439,7 +439,7 @@ _elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
439 /* access */ 439 /* access */
440 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE); 440 if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
441 441
442 return EFL_UI_THEME_APPLY_RESULT_SUCCESS; 442 return EFL_UI_THEME_APPLY_ERROR_NONE;
443} 443}
444 444
445static void 445static void
@@ -503,14 +503,6 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd)
503 else 503 else
504 evas_object_size_hint_min_set(sd->spacer, minw, minh); 504 evas_object_size_hint_min_set(sd->spacer, minw, minh);
505 505
506 if (sd->main_layout)
507 {
508 Evas *ev = evas_object_evas_get(sd->main_layout);
509 if (evas_smart_objects_calculating_get(ev))
510 evas_object_smart_calculate(sd->main_layout);
511 else
512 evas_object_smart_need_recalculate_set(sd->main_layout, EINA_TRUE);
513 }
514 return; 506 return;
515 } 507 }
516 508
@@ -1824,7 +1816,7 @@ _elm_popup_efl_access_object_state_set_get(const Eo *obj, Elm_Popup_Data *sd EIN
1824 Efl_Access_State_Set ret; 1816 Efl_Access_State_Set ret;
1825 ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS)); 1817 ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
1826 1818
1827 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); 1819 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MODAL);
1828 1820
1829 return ret; 1821 return ret;
1830} 1822}
@@ -1875,5 +1867,5 @@ ELM_PART_OVERRIDE_TEXT_GET(elm_popup, ELM_POPUP, Elm_Popup_Data)
1875 ELM_LAYOUT_SIZING_EVAL_OPS(elm_popup), \ 1867 ELM_LAYOUT_SIZING_EVAL_OPS(elm_popup), \
1876 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup) 1868 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup)
1877 1869
1878#include "elm_popup.eo.c" 1870#include "elm_popup_eo.c"
1879#include "elm_popup_item.eo.c" 1871#include "elm_popup_item_eo.c"