gui: fill in the widget list inside the gui create function.

Do not need to call this separately from main.
This commit is contained in:
Daniel Juyung Seo 2014-02-26 02:17:04 +09:00
parent 8bb112f730
commit b043104182
3 changed files with 10 additions and 13 deletions

View File

@ -29,6 +29,8 @@ struct _Style_Data
const char *style;
};
static void _gui_widget_load(void);
int
gui_init(void)
{
@ -135,7 +137,7 @@ _entry_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
elm_list_clear(gd->list);
elm_list_go(gd->list);
gui_widget_load();
_gui_widget_load();
}
Evas_Object *
@ -164,6 +166,9 @@ gui_widget_menu_create(Evas_Object *parent)
elm_box_pack_end(box, o);
evas_object_show(o);
// fill in the widget list
_gui_widget_load();
elm_naviframe_item_push(nf, "Widgets", NULL, NULL, box, NULL);
return nf;
@ -651,8 +656,8 @@ _widget_list_sel_cb(void *data, Evas_Object *obj EINA_UNUSED,
/*
* widget list
*/
void
gui_widget_load(void)
static void
_gui_widget_load(void)
{
Eina_List *l;
Widget_Data *wd;

View File

@ -45,8 +45,6 @@ Evas_Object *gui_preview_create(Evas_Object *parent);
void gui_preview_focus(void); // Set the focus to the preview object
Evas_Object *gui_widget_menu_create(Evas_Object *parent);
void gui_widget_load(void);
void gui_version_set(Eina_Bool version);
void gui_panes_clicked_double_cb(void *data, Evas_Object *obj, void *event_info);

View File

@ -132,15 +132,9 @@ elm_main(int argc, char **argv)
gui_version_set(mobile_version);
if (mobile_version)
{
gui_mobile_create(edje_file, width, height, fullscreen);
gui_widget_load();
}
gui_mobile_create(edje_file, width, height, fullscreen);
else
{
gui_create(edje_file, width, height, fullscreen);
gui_widget_load();
}
gui_create(edje_file, width, height, fullscreen);
elm_run();