ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=4b85f853918eff527c7455585f0f9fa7bbc6d8d8
commit 4b85f853918eff527c7455585f0f9fa7bbc6d8d8 Author: Andy Williams <[email protected]> Date: Mon Feb 9 14:38:32 2015 +0000 about: Fix window to be a dialog and layout a little to fit the dialog theme --- src/bin/edi_main.c | 2 +- src/bin/screens/edi_about.c | 16 +++++++++++----- src/bin/screens/edi_screens.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 3a58306..b18af64 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -642,7 +642,7 @@ _tb_clean_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNU static void _tb_about_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - edi_about_show(); + edi_about_show(_edi_main_win); } static Evas_Object * diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c index 2435c74..ff7a2be 100644 --- a/src/bin/screens/edi_about.c +++ b/src/bin/screens/edi_about.c @@ -29,16 +29,18 @@ _edi_about_url_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN free(cmd); } -Evas_Object *edi_about_show() +Evas_Object * +edi_about_show(Evas_Object *mainwin) { Evas_Object *win, *vbox, *box, *table, *bg; Evas_Object *text, *title, *authors, *buttonbox, *button, *space; int alpha, r, g, b; char buf[PATH_MAX]; - win = elm_win_util_standard_add("about", "About Edi"); + win = elm_win_add(mainwin, "about", ELM_WIN_DIALOG_BASIC); if (!win) return NULL; + elm_win_title_set(win, "About Edi"); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); evas_object_smart_callback_add(win, "delete,request", _edi_about_exit, win); @@ -117,6 +119,11 @@ Evas_Object *edi_about_show() elm_box_pack_end(box, buttonbox); evas_object_show(buttonbox); + space = elm_box_add(box); + evas_object_size_hint_min_set(space, 0, 14 * elm_config_scale_get()); + elm_box_pack_end(box, space); + evas_object_show(space); + button = elm_button_add(box); elm_object_text_set(button, "Visit Website"); evas_object_smart_callback_add(button, "clicked", _edi_about_url_cb, @@ -125,7 +132,7 @@ Evas_Object *edi_about_show() evas_object_show(button); space = elm_box_add(box); - evas_object_size_hint_min_set(space, 20 * elm_config_scale_get(), 0.0); + evas_object_size_hint_min_set(space, 20 * elm_config_scale_get(), 0); elm_box_pack_end(buttonbox, space); evas_object_show(space); @@ -137,7 +144,7 @@ Evas_Object *edi_about_show() evas_object_show(button); space = elm_box_add(box); - evas_object_size_hint_min_set(space, 20 * elm_config_scale_get(), 0.0); + evas_object_size_hint_min_set(space, 20 * elm_config_scale_get(), 0); elm_box_pack_end(buttonbox, space); evas_object_show(space); @@ -148,7 +155,6 @@ Evas_Object *edi_about_show() elm_box_pack_end(buttonbox, button); evas_object_show(button); - evas_object_resize(table, 360 * elm_config_scale_get(), 220 * elm_config_scale_get()); evas_object_resize(win, 360 * elm_config_scale_get(), 220 * elm_config_scale_get()); evas_object_show(win); diff --git a/src/bin/screens/edi_screens.h b/src/bin/screens/edi_screens.h index 62ad4ed..7304487 100644 --- a/src/bin/screens/edi_screens.h +++ b/src/bin/screens/edi_screens.h @@ -37,7 +37,7 @@ Evas_Object *edi_welcome_show(); * @return The about window that is created * * @ingroup UI */ -Evas_Object *edi_about_show(); +Evas_Object *edi_about_show(Evas_Object *mainwin); /** * @} --
