From 07523ed88a6d0d8d8adee6105c3bdb09e931ce29 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Fri, 1 Mar 2013 23:04:31 -0300 Subject: [PATCH] An internal layout error, on a widget set, is a CRITICAL error. --- doc/widgets/widget_preview_layout.c | 6 +++++- src/bin/test_layout.c | 18 +++++++++++++--- src/examples/entry_example.c | 12 +++++++++-- src/examples/layout_example_02.c | 5 +++-- src/lib/elc_ctxpopup.c | 5 ++++- src/lib/elc_fileselector.c | 5 +++-- src/lib/elc_fileselector_entry.c | 5 +++-- src/lib/elc_multibuttonentry.c | 5 +++-- src/lib/elc_naviframe.c | 5 +++-- src/lib/elc_player.c | 3 ++- src/lib/elc_popup.c | 33 +++++++++++++++++------------ src/lib/elm_actionslider.c | 5 +++-- src/lib/elm_bg.c | 3 ++- src/lib/elm_bubble.c | 3 ++- src/lib/elm_button.c | 3 ++- src/lib/elm_calendar.c | 4 +++- src/lib/elm_check.c | 4 +++- src/lib/elm_clock.c | 24 +++++++++++++++------ src/lib/elm_colorselector.c | 16 ++++++++------ src/lib/elm_conform.c | 4 +++- src/lib/elm_datetime.c | 4 +++- src/lib/elm_dayselector.c | 3 ++- src/lib/elm_entry.c | 3 ++- src/lib/elm_flipselector.c | 5 +++-- src/lib/elm_frame.c | 3 ++- src/lib/elm_gengrid.c | 4 +++- src/lib/elm_genlist.c | 4 +++- src/lib/elm_hover.c | 4 +++- src/lib/elm_index.c | 5 +++-- src/lib/elm_inwin.c | 3 ++- src/lib/elm_label.c | 4 +++- src/lib/elm_list.c | 3 ++- src/lib/elm_map.c | 41 +++++++++++++++++++++++------------- src/lib/elm_notify.c | 4 +++- src/lib/elm_panel.c | 42 +++++++++++++++++++++++++------------ src/lib/elm_panes.c | 4 +++- src/lib/elm_progressbar.c | 5 +++-- src/lib/elm_radio.c | 3 ++- src/lib/elm_scroller.c | 4 +++- src/lib/elm_segment_control.c | 5 +++-- src/lib/elm_separator.c | 5 +++-- src/lib/elm_slider.c | 5 +++-- src/lib/elm_slideshow.c | 4 +++- src/lib/elm_spinner.c | 7 ++++++- src/lib/elm_thumb.c | 16 ++++++++------ src/lib/elm_toolbar.c | 9 +++++--- src/lib/elm_video.c | 4 +++- 47 files changed, 254 insertions(+), 117 deletions(-) diff --git a/doc/widgets/widget_preview_layout.c b/doc/widgets/widget_preview_layout.c index 6ad2873..301f54d 100644 --- a/doc/widgets/widget_preview_layout.c +++ b/doc/widgets/widget_preview_layout.c @@ -2,7 +2,11 @@ Evas_Object *layout = elm_layout_add(win); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -elm_layout_theme_set(layout, "layout", "application", "toolbar-content-back-next"); + +if (!elm_layout_theme_set + (layout, "layout", "application", "toolbar-content-back-next")) + fprintf(stderr, "Failed to set layout!"); + elm_win_resize_object_add(win, layout); evas_object_show(layout); diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c index 659e86a..9caac5c 100644 --- a/src/bin/test_layout.c +++ b/src/bin/test_layout.c @@ -49,7 +49,11 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(box); ly = elm_layout_add(win); - elm_layout_theme_set(ly, "layout", "application", "titlebar"); + + if (!elm_layout_theme_set( + ly, "layout", "application", "titlebar")) + fprintf(stderr, "Failed to set layout"); + elm_object_part_text_set(ly, "elm.text", "Some title"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -217,7 +221,11 @@ test_layout2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf /* Layout Box Test */ api->box_layout = ly = elm_layout_add(win); - elm_layout_theme_set(ly, "layout", "application", "toolbar-vbox"); + + if (!elm_layout_theme_set( + ly, "layout", "application", "toolbar-vbox")) + fprintf(stderr, "Failed to set layout"); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(box, ly); @@ -232,7 +240,11 @@ test_layout2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf /* Layout Table Test */ api->table_layout = ly = elm_layout_add(win); - elm_layout_theme_set(ly, "layout", "application", "toolbar-table"); + + if (!elm_layout_theme_set( + ly, "layout", "application", "toolbar-table")) + fprintf(stderr, "Failed to set layout"); + evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(box, ly); diff --git a/src/examples/entry_example.c b/src/examples/entry_example.c index b28b76c..2021fb4 100644 --- a/src/examples/entry_example.c +++ b/src/examples/entry_example.c @@ -57,7 +57,11 @@ _emo_content_get(void *data, Evas_Object *obj, const char *part) if (strcmp(part, "elm.swallow.icon")) return NULL; o = elm_layout_add(obj); - elm_layout_theme_set(o, "entry/emoticon", data, "default"); + if (!elm_layout_theme_set(o, "entry/emoticon", data, "default")) + { + fprintf(stderr, "Failed to set layout"); + return NULL; + } return o; } @@ -545,7 +549,11 @@ elm_main(int argc, char *argv[]) evas_object_show(o); icon = elm_layout_add(win); - elm_layout_theme_set(icon, "entry", "emoticon/haha", "default"); + + if (!elm_layout_theme_set( + icon, "entry", "emoticon/haha", "default")) + fprintf(stderr, "Failed to set layout"); + elm_object_part_content_set(o, "icon", icon); evas_object_smart_callback_add(o, "clicked", _image_insert_cb, &app); diff --git a/src/examples/layout_example_02.c b/src/examples/layout_example_02.c index 9bf59dd..034e59f 100644 --- a/src/examples/layout_example_02.c +++ b/src/examples/layout_example_02.c @@ -58,8 +58,9 @@ elm_main(int argc, char **argv) layout = elm_layout_add(win); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, layout); - elm_layout_theme_set( - layout, "layout", "application", "content-back-next"); + if (!elm_layout_theme_set( + layout, "layout", "application", "content-back-next")) + fprintf(stderr, "Failed to set layout"); evas_object_show(layout); icon = elm_icon_add(win); diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 278c03c..2395e57 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -1050,7 +1050,10 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set(obj, "ctxpopup", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "ctxpopup", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_signal_callback_add (obj, "elm,action,hide,finished", "", _hide_finished_cb, obj); diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index fd4760e..b25dede 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -760,8 +760,9 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->expand = !!_elm_config->fileselector_expand_enable; - elm_layout_theme_set - (obj, "fileselector", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "fileselector", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); // up btn ic = elm_icon_add(obj); diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index 22e961d..386058b 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -342,8 +342,9 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "fileselector_entry", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "fileselector_entry", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->button = elm_fileselector_button_add(obj); elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE); diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index 2072937..38072c9 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -1515,8 +1515,9 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "multibuttonentry", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "multibuttonentry", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_widget_can_focus_set(obj, EINA_TRUE); diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index c992ae9..d5724c9 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -257,8 +257,9 @@ _item_style_set(Elm_Naviframe_Item *it, eina_stringshare_replace(&it->style, item_style); } - elm_layout_theme_set(VIEW(it), "naviframe", buf, - elm_widget_style_get(WIDGET(it))); + if (!elm_layout_theme_set(VIEW(it), "naviframe", buf, + elm_widget_style_get(WIDGET(it)))) + CRITICAL("Failed to set layout!"); if (sd->freeze_events) evas_object_freeze_events_set(VIEW(it), EINA_FALSE); diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c index 02527f7..4b1b5d0 100644 --- a/src/lib/elc_player.c +++ b/src/lib/elc_player.c @@ -510,7 +510,8 @@ _elm_player_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) Elm_Player_Smart_Data *priv = _pd; - elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->forward = _player_button_add(obj, "media_player/forward", _forward); priv->info = _player_button_add(obj, "media_player/info", _info); diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 6c6e49c..09b3b3a 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -296,16 +296,18 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list) if (sd->button_count) { snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); - elm_layout_theme_set(sd->action_area, "popup", buf, - elm_widget_style_get(obj)); + if (!elm_layout_theme_set(sd->action_area, "popup", buf, + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++) { if (!sd->buttons[i]) continue; elm_object_style_set(sd->buttons[i]->btn, buf); } } - elm_layout_theme_set(sd->content_area, "popup", "content", - elm_widget_style_get(obj)); + if (!elm_layout_theme_set(sd->content_area, "popup", "content", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); if (sd->text_content_obj) { snprintf(buf, sizeof(buf), "popup/%s", elm_widget_style_get(obj)); @@ -543,8 +545,9 @@ _button_remove(Evas_Object *obj, else { snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); - elm_layout_theme_set - (sd->action_area, "popup", buf, elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (sd->action_area, "popup", buf, elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); } } @@ -1085,8 +1088,9 @@ _action_button_set(Evas_Object *obj, } snprintf(buf, sizeof(buf), "buttons%u", sd->button_count); - elm_layout_theme_set - (sd->action_area, "popup", buf, elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (sd->action_area, "popup", buf, elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); adata = ELM_NEW(Action_Area_Data); adata->obj = obj; @@ -1452,7 +1456,8 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) if (!elm_widget_sub_object_add(eo_parent_get(obj), obj)) ERR("could not add %p as sub object of %p", obj, eo_parent_get(obj)); - elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->notify = elm_notify_add(obj); elm_notify_align_set(priv->notify, 0.5, 0.5); @@ -1480,11 +1485,13 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (obj, "elm,state,action_area,hidden", "elm", _layout_change_cb, obj); priv->content_area = elm_layout_add(obj); - elm_layout_theme_set - (priv->content_area, "popup", "content", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (priv->content_area, "popup", "content", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->action_area = elm_layout_add(obj); - elm_layout_theme_set(priv->action_area, "popup", "buttons0", - elm_widget_style_get(obj)); + if (!elm_layout_theme_set(priv->action_area, "popup", "buttons0", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); evas_object_size_hint_weight_set(priv->action_area, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(priv->action_area, EVAS_HINT_FILL, diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index 82b56be..83e7afb 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -408,8 +408,9 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (wd->resize_obj, "elm.drag_button,mouse,move", "", _drag_button_move_cb, obj); - elm_layout_theme_set - (obj, "actionslider", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "actionslider", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base); diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c index db355b8..fcdc41a 100644 --- a/src/lib/elm_bg.c +++ b/src/lib/elm_bg.c @@ -113,7 +113,8 @@ _elm_bg_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj); - elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); } static void diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c index 9c187af..08bf145 100644 --- a/src/lib/elm_bubble.c +++ b/src/lib/elm_bubble.c @@ -212,7 +212,8 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) _elm_access_callback_set (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); - elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_sizing_eval(obj); diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index c4ea81f..4424cad 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -317,7 +317,8 @@ _elm_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, priv); elm_widget_can_focus_set(obj, EINA_TRUE); - elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); } static void diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index ffa0ede..f2156bf 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -1008,7 +1008,9 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_TRUE); - elm_layout_theme_set(obj, "calendar", "base", elm_object_style_get(obj)); + if (!elm_layout_theme_set(obj, "calendar", "base", + elm_object_style_get(obj))) + CRITICAL("Failed to set layout!"); evas_object_smart_changed(obj); diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index e26b39c..a554b40 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -308,7 +308,9 @@ _elm_check_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_TRUE); - elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_sizing_eval(obj); } diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c index 74a62ac..43084df 100644 --- a/src/lib/elm_clock.c +++ b/src/lib/elm_clock.c @@ -361,13 +361,25 @@ _time_update(Evas_Object *obj) } if ((sd->seconds) && (sd->am_pm)) - elm_layout_theme_set(obj, "clock", "base-all", style); + { + if (!elm_layout_theme_set(obj, "clock", "base-all", style)) + CRITICAL("Failed to set layout!"); + } else if (sd->seconds) - elm_layout_theme_set(obj, "clock", "base-seconds", style); + { + if (!elm_layout_theme_set(obj, "clock", "base-seconds", style)) + CRITICAL("Failed to set layout!"); + } else if (sd->am_pm) - elm_layout_theme_set(obj, "clock", "base-am_pm", style); + { + if (!elm_layout_theme_set(obj, "clock", "base-am_pm", style)) + CRITICAL("Failed to set layout!"); + } else - elm_layout_theme_set(obj, "clock", "base", style); + { + if (!elm_layout_theme_set(obj, "clock", "base", style)) + CRITICAL("Failed to set layout!"); + } edje_object_scale_set (wd->resize_obj, elm_widget_scale_get(obj) * @@ -446,8 +458,8 @@ _time_update(Evas_Object *obj) evas_object_show(sd->am_pm_obj); } - /* access */ - if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) + /* access */ + if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) _access_time_register(obj, EINA_TRUE); edje_object_size_min_calc(wd->resize_obj, &mw, &mh); diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index 7407a31..d6eca49 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -1093,8 +1093,10 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd, va_list *list) EINA_LIST_FOREACH(sd->items, elist, item) { - elm_layout_theme_set - (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (VIEW(item), "colorselector", "item", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_widget_theme_object_set (obj, item->color_obj, "colorselector", "item/color", elm_widget_style_get(obj)); @@ -1357,8 +1359,9 @@ _item_new(Evas_Object *obj) if (!item) return NULL; VIEW(item) = elm_layout_add(obj); - elm_layout_theme_set - (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (VIEW(item), "colorselector", "item", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -1460,8 +1463,9 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "colorselector", "palette", elm_object_style_get(obj)); + if (!elm_layout_theme_set + (obj, "colorselector", "palette", elm_object_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->palette_box = elm_box_add(obj); elm_box_layout_set diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index d84ee20..e94de1b 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -888,7 +888,9 @@ _elm_conformant_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNU elm_widget_can_focus_set(obj, EINA_FALSE); - elm_layout_theme_set(obj, "conformant", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "conformant", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); _conformant_parts_swallow(obj); diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index 29a5e5a..2672565 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -766,7 +766,9 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set(obj, "datetime", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "datetime", "base", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); // module - initialise module for datetime if (!dt_mod) dt_mod = _dt_mod_init(); diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 1338812..259a512 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -424,7 +424,8 @@ _elm_dayselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set(obj, "dayselector", "base", "dayselector"); + if (!elm_layout_theme_set(obj, "dayselector", "base", "dayselector")) + CRITICAL("Failed to set layout!"); priv->week_start = _elm_config->week_start; priv->weekend_start = _elm_config->weekend_start; diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 237c20c..00c6f4a 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -2781,7 +2781,8 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->auto_save = EINA_TRUE; priv->editable = EINA_TRUE; - elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index e6f14b3..e544dde 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -555,8 +555,9 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "flipselector", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "flipselector", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_signal_callback_add (obj, "elm,action,up,start", "", _signal_val_up_start, obj); diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c index eb36634..9410279 100644 --- a/src/lib/elm_frame.c +++ b/src/lib/elm_frame.c @@ -180,7 +180,8 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_FALSE); - elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 5369b77..78c0954 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -2402,7 +2402,9 @@ _elm_gengrid_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->generation = 1; - elm_layout_theme_set(obj, "gengrid", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "gengrid", "base", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index db975b7..a4f7284 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -4722,7 +4722,9 @@ _elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->generation = 1; - elm_layout_theme_set(obj, "genlist", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "genlist", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c index 470871c..89ce08d 100644 --- a/src/lib/elm_hover.c +++ b/src/lib/elm_hover.c @@ -537,7 +537,9 @@ _elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) for (i = 0; i < sizeof(priv->subs) / sizeof(priv->subs[0]); i++) priv->subs[i].swallow = _content_aliases[i].alias; - elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_signal_callback_add (obj, "elm,action,dismiss", "", _hov_dismiss_cb, obj); diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index c4778d2..6b0ce03 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -892,8 +892,9 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "index", "base/vertical", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "index", "base/vertical", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); o = evas_object_rectangle_add(evas_object_evas_get(obj)); priv->event[0] = o; diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c index 9f39758..67212c1 100644 --- a/src/lib/elm_inwin.c +++ b/src/lib/elm_inwin.c @@ -77,7 +77,8 @@ _elm_inwin_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj)); + if (!elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj))) + CRITICAL("Failed to set layout!"); } static void diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c index 36ac627..dabf952 100644 --- a/src/lib/elm_label.c +++ b/src/lib/elm_label.c @@ -405,7 +405,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) _elm_access_callback_set (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); - elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_text_set(obj, NULL, "
"); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 9f1e231..3e46dc0 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -1592,7 +1592,8 @@ _elm_list_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->mode = ELM_LIST_SCROLL; - elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 21b3342..610b134 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -1518,26 +1518,31 @@ _overlay_default_layout_update(Overlay_Default *ovl) if (ovl->icon) { evas_object_color_set(ovl->layout, 255, 255, 255, 255); - elm_layout_theme_set - (ovl->layout, "map/marker", "empty", - elm_widget_style_get((ovl->wsd)->obj)); + if (!elm_layout_theme_set + (ovl->layout, "map/marker", "empty", + elm_widget_style_get((ovl->wsd)->obj))) + CRITICAL("Failed to set layout!"); + elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon); } else if (!ovl->icon && ovl->clas_icon) { evas_object_color_set(ovl->layout, 255, 255, 255, 255); - elm_layout_theme_set - (ovl->layout, "map/marker", "empty", - elm_widget_style_get((ovl->wsd)->obj)); + if (!elm_layout_theme_set + (ovl->layout, "map/marker", "empty", + elm_widget_style_get((ovl->wsd)->obj))) + CRITICAL("Failed to set layout!"); + elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon); } else { evas_object_color_set (ovl->layout, ovl->c.r, ovl->c.g, ovl->c.b, ovl->c.a); - elm_layout_theme_set - (ovl->layout, "map/marker", "radio", - elm_widget_style_get((ovl->wsd)->obj)); + if (!elm_layout_theme_set + (ovl->layout, "map/marker", "radio", + elm_widget_style_get((ovl->wsd)->obj))) + CRITICAL("Failed to set layout!"); } } @@ -1619,8 +1624,10 @@ _overlay_default_new(Elm_Map_Overlay *overlay, ovl->layout = elm_layout_add((ovl->wsd)->obj); evas_object_smart_member_add(ovl->layout, ovl->wsd->pan_obj); evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays); - elm_layout_theme_set(ovl->layout, "map/marker", "radio", - elm_widget_style_get((ovl->wsd)->obj)); + if (!elm_layout_theme_set(ovl->layout, "map/marker", "radio", + elm_widget_style_get((ovl->wsd)->obj))) + CRITICAL("Failed to set layout!"); + evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN, _overlay_clicked_cb, overlay); ovl->lon = lon; @@ -2310,8 +2317,10 @@ _overlay_circle_new(Elm_Map_Smart_Data *sd, ovl->obj = elm_layout_add(sd->obj); evas_object_smart_member_add(ovl->obj, sd->pan_obj); evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); - elm_layout_theme_set(ovl->obj, "map/circle", "base", - elm_widget_style_get(sd->obj)); + if (!elm_layout_theme_set(ovl->obj, "map/circle", "base", + elm_widget_style_get(sd->obj))) + CRITICAL("Failed to set layout!"); + _overlay_circle_color_update(ovl, c); return ovl; @@ -2394,8 +2403,10 @@ _overlay_scale_new(Elm_Map_Smart_Data *sd, ovl->obj = elm_layout_add(sd->obj); evas_object_smart_member_add(ovl->obj, sd->pan_obj); evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); - elm_layout_theme_set(ovl->obj, "map/scale", "base", - elm_widget_style_get(sd->obj)); + if (!elm_layout_theme_set(ovl->obj, "map/scale", "base", + elm_widget_style_get(sd->obj))) + CRITICAL("Failed to set layout!"); + s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w"); if (s) ovl->w = atoi(s); diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c index 1068efc..e77a407 100644 --- a/src/lib/elm_notify.c +++ b/src/lib/elm_notify.c @@ -86,7 +86,9 @@ _block_events_theme_apply(Evas_Object *obj) const char *style = elm_widget_style_get(obj); - elm_layout_theme_set(sd->block_events, "notify", "block_events", style); + if (!elm_layout_theme_set + (sd->block_events, "notify", "block_events", style)) + CRITICAL("Failed to set layout!"); } static void diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index d66030a..b15088e 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -54,30 +54,45 @@ _orient_set_do(Evas_Object *obj) switch (sd->orient) { case ELM_PANEL_ORIENT_TOP: - elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "panel", "top", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); break; case ELM_PANEL_ORIENT_BOTTOM: - elm_layout_theme_set - (obj, "panel", "bottom", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "panel", "bottom", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); break; case ELM_PANEL_ORIENT_LEFT: if (!elm_widget_mirrored_get(obj)) - elm_layout_theme_set - (obj, "panel", "left", elm_widget_style_get(obj)); + { + if (!elm_layout_theme_set + (obj, "panel", "left", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + } else - elm_layout_theme_set - (obj, "panel", "right", elm_widget_style_get(obj)); + { + if (!elm_layout_theme_set + (obj, "panel", "right", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + } break; case ELM_PANEL_ORIENT_RIGHT: if (!elm_widget_mirrored_get(obj)) - elm_layout_theme_set - (obj, "panel", "right", elm_widget_style_get(obj)); + { + if (!elm_layout_theme_set + (obj, "panel", "right", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + } else - elm_layout_theme_set - (obj, "panel", "left", elm_widget_style_get(obj)); + { + if (!elm_layout_theme_set + (obj, "panel", "left", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + } break; } @@ -86,7 +101,7 @@ _orient_set_do(Evas_Object *obj) { Evas_Object *ao; ao = _elm_access_edje_object_part_object_register - (obj, wd->resize_obj, "btn_icon"); + (obj, wd->resize_obj, "btn_icon"); _elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_TYPE, E_("panel button")); _elm_access_callback_set @@ -322,7 +337,8 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_TRUE); /* just to bootstrap and have theme hook to work */ - elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); eo_do(obj, elm_wdg_theme(NULL)); diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c index 0beba7a..b9c53a2 100644 --- a/src/lib/elm_panes.c +++ b/src/lib/elm_panes.c @@ -187,7 +187,9 @@ _elm_panes_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set(obj, "panes", "vertical", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "panes", "vertical", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_panes_content_left_size_set(obj, 0.5); diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c index 73490d7..03b0a22 100644 --- a/src/lib/elm_progressbar.c +++ b/src/lib/elm_progressbar.c @@ -244,8 +244,9 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->units = eina_stringshare_add("%.0f %%"); priv->val = MIN_RATIO_LVL; - elm_layout_theme_set - (obj, "progressbar", "horizontal", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "progressbar", "horizontal", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_color_set(priv->spacer, 0, 0, 0, 0); diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index 4598266..9252ec9 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -268,7 +268,8 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_signal_callback_add (obj, "elm,action,radio,on", "", _radio_on_cb, obj); diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index ffbe3d6..f78a809 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -708,7 +708,9 @@ _elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_can_focus_set(obj, EINA_TRUE); - elm_layout_theme_set(obj, "scroller", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "scroller", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_smart_member_add(priv->hit_rect, obj); diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 0d1a688..9de331b 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -591,8 +591,9 @@ _elm_segment_control_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EIN { eo_do_super(obj, evas_obj_smart_add()); - elm_layout_theme_set - (obj, "segment_control", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "segment_control", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); evas_object_event_callback_add (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj); diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c index 2fabf5a..3acd509 100644 --- a/src/lib/elm_separator.c +++ b/src/lib/elm_separator.c @@ -50,8 +50,9 @@ _elm_separator_smart_add(Eo *obj, void *_pd __UNUSED__, elm_widget_can_focus_set(obj, EINA_FALSE); - elm_layout_theme_set - (obj, "separator", "vertical", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "separator", "vertical", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_sizing_eval(obj); } diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 64e2ab7..f4afe91 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -757,8 +757,9 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->indicator_show = EINA_TRUE; priv->val_max = 1.0; - elm_layout_theme_set - (obj, "slider", "horizontal", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "slider", "horizontal", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj); elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj); diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c index 5b581fd..81015cb 100644 --- a/src/lib/elm_slideshow.c +++ b/src/lib/elm_slideshow.c @@ -315,7 +315,9 @@ _elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->count_item_pre_before = 2; priv->count_item_pre_after = 2; - elm_layout_theme_set(obj, "slideshow", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (obj, "slideshow", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); priv->transitions = elm_widget_stringlist_get (edje_object_data_get(wd->resize_obj, diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 56ba3f5..57641ba 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -630,7 +630,10 @@ _elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->step = 1.0; priv->first_interval = 0.85; - elm_layout_theme_set(obj, "spinner", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "spinner", "base", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj); elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start_cb, obj); elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop_cb, obj); @@ -700,6 +703,8 @@ _elm_spinner_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) elm_widget_style_get(obj)); if (ret) *ret = int_ret; + if (!int_ret) CRITICAL("Failed to set layout!"); + if (_elm_config->access_mode) _access_spinner_register(obj, EINA_TRUE); } diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c index 6f7926e..f93c8f8 100644 --- a/src/lib/elm_thumb.c +++ b/src/lib/elm_thumb.c @@ -533,9 +533,13 @@ _elm_thumb_smart_theme(Eo *obj, void *_pd __UNUSED__, va_list *list) eo_do_super(obj, elm_wdg_theme(&int_ret)); if (!int_ret) return; - elm_layout_theme_set - (wd->resize_obj, "thumb", "base", - elm_widget_style_get(obj)); + if (!elm_layout_theme_set(wd->resize_obj, "thumb", "base", + elm_widget_style_get(obj))) + { + if (ret) *ret = EINA_FALSE; + CRITICAL("Failed to set layout!"); + return; + } if (ret) *ret = EINA_TRUE; } @@ -567,9 +571,9 @@ _elm_thumb_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_widget_resize_object_set(obj, elm_layout_add(obj)); - elm_layout_theme_set - (wd->resize_obj, "thumb", "base", - elm_widget_style_get(obj)); + if (!elm_layout_theme_set(wd->resize_obj, "thumb", "base", + elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); #ifdef HAVE_ELEMENTARY_ETHUMB evas_object_event_callback_add diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index f0b0060..848d544 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -1015,8 +1015,9 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list) (obj, wd->resize_obj, "toolbar", "base", elm_widget_style_get(obj)); - elm_layout_theme_set - (sd->more, "toolbar", "more", elm_widget_style_get(obj)); + if (!elm_layout_theme_set + (sd->more, "toolbar", "more", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -2329,7 +2330,9 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) evas_object_show(priv->bx); priv->more = elm_layout_add(obj); - elm_layout_theme_set(priv->more, "toolbar", "more", "default"); + if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default")) + CRITICAL("Failed to set layout!"); + elm_widget_sub_object_add(obj, priv->more); evas_object_show(priv->more); diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c index e71a982..d2ca866 100644 --- a/src/lib/elm_video.c +++ b/src/lib/elm_video.c @@ -244,7 +244,9 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) priv->emotion = emotion_object_add(evas_object_evas_get(obj)); emotion_object_init(priv->emotion, NULL); - elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)); + if (!elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj))) + CRITICAL("Failed to set layout!"); + elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); evas_object_smart_callback_add -- 2.7.4