devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=23a6a672909fb7322763e83beb5cc2def7f31618
commit 23a6a672909fb7322763e83beb5cc2def7f31618 Author: Simon Tischer <[email protected]> Date: Sat Apr 11 17:32:29 2020 +0200 various settings dialogs: sizing/align optimizations Reviewed-by: Christopher Michael <[email protected]> Differential Revision: https://phab.enlightenment.org/D11682 --- src/modules/conf_display/e_int_config_desklock.c | 12 ++++++------ src/modules/conf_display/e_int_config_screensaver.c | 6 +++--- src/modules/conf_menus/e_int_config_menus.c | 14 +++++--------- src/modules/pager/e_mod_config.c | 14 +++++++------- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/modules/conf_display/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c index c5fe0aa23..08632b10a 100644 --- a/src/modules/conf_display/e_int_config_desklock.c +++ b/src/modules/conf_display/e_int_config_desklock.c @@ -286,7 +286,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Locking"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Keyboard Layout */ cfdata->gui.kbd_list = ol = e_widget_ilist_add(evas, 32 * e_scale, 32 * e_scale, &cfdata->desklock_layout); @@ -324,7 +324,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) grp++; } e_widget_toolbook_page_append(otb, NULL, _("Keyboard Layout"), ol, - 1, 1, 1, 1, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Login */ ol = e_widget_list_add(evas, 0, 0); @@ -350,7 +350,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_disabled_set(cfdata->gui.loginbox_slider, (screen_count <= 0)); e_widget_list_object_append(ol, cfdata->gui.loginbox_slider, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Login Box"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Timers */ ol = e_widget_list_add(evas, 0, 0); @@ -375,7 +375,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Timers"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Presentation */ ol = e_widget_list_add(evas, 0, 0); @@ -387,7 +387,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Presentation Mode"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Wallpapers */ ol = e_widget_list_add(evas, 0, 0); @@ -426,7 +426,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _cb_method_change(cfdata, NULL, NULL); e_widget_list_object_append(ol, cfdata->gui.o_table, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Wallpaper"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); e_widget_toolbook_page_show(otb, 0); diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index ed94ccb12..763a8a466 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -255,7 +255,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_list_object_append(ol, oc, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Blanking"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Wakeups */ ol = e_widget_list_add(evas, 0, 0); @@ -266,7 +266,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data &(cfdata->wake_on_urgent)); e_widget_list_object_append(ol, oc, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Wakeups"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); /* Presentation */ ol = e_widget_list_add(evas, 0, 0); oc2 = e_widget_check_add(evas, _("Suggest if deactivated before"), @@ -282,7 +282,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_on_disable_hook_set(ow, _cb_ask_presentation_changed, cfdata); e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Presentation"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); e_widget_toolbook_page_show(otb, 0); diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index d0ad0c1cc..50ca96d95 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -276,14 +276,12 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel)); e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Menus"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Menus"), ol, 1, 1, 1, 0, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); ow = _create_menus_list(evas, cfdata); - e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Applications"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Applications"), ol, 1, 1, 1, 1, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); ow = e_widget_label_add(evas, _("Margin")); @@ -296,8 +294,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL, &(cfdata->autoscroll_cursor_margin), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Autoscroll"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Autoscroll"), ol, 1, 1, 1, 0, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); ow = e_widget_check_add(evas, _("Disable icons in menus"), &(cfdata->hide_icons)); @@ -317,8 +314,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data ow = e_widget_slider_add(evas, 1, 0, _("%2.2f s"), 0, 10, 0.25, 0, &(cfdata->click_drag_timeout), NULL, 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 1, 1, 1, 0, 0.0, 0.0); e_widget_toolbook_page_show(otb, 0); return otb; diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 4fa9d334a..2fb019309 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -130,7 +130,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) ow = e_widget_check_add(evas, _("Always show desktop names"), &(cfdata->show_desk_names)); e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(ol, of, 1, 0, 0.5); + e_widget_list_object_append(ol, of, 1, 0, 0.0); of = e_widget_framelist_add(evas, _("Popup"), 0); ow = e_widget_check_add(evas, _("Show popup on desktop change"), @@ -139,7 +139,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) ow = e_widget_check_add(evas, _("Show popup for urgent windows"), &(cfdata->popup.urgent_show)); e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(ol, of, 1, 0, 0.5); + e_widget_list_object_append(ol, of, 1, 0, 0.0); return ol; } @@ -209,8 +209,8 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) cfdata->gui.ob3 = ow; e_widget_list_object_append(ol, ow, 1, 0, 0.5); _update_btns(cfdata); - e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 1, 1, 0, + 0.0, 0.0); /* Popup Page */ ol = e_widget_list_add(evas, 0, 0); @@ -244,8 +244,8 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 20.0, 200.0, 1.0, 0, NULL, &(cfdata->popup.act_height), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Popup"), ol, 1, 0, 1, 0, - 0.5, 0.0); + e_widget_toolbook_page_append(otb, NULL, _("Popup"), ol, 1, 1, 1, 0, + 0.0, 0.0); /* Urgent Page */ ol = e_widget_list_add(evas, 0, 0); @@ -277,7 +277,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_on_change_hook_set(uc, _cb_disable_check_list, cfdata->gui.urgent_list); e_widget_toolbook_page_append(otb, NULL, _("Urgent Windows"), ol, - 1, 0, 1, 0, 0.5, 0.0); + 1, 1, 1, 0, 0.0, 0.0); e_widget_toolbook_page_show(otb, 0); return otb; --
