From a5d004a49b5948b68e848464f1c87f682156436a Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 20 Aug 2022 11:03:07 -0400 Subject: [PATCH] e_int_client_prop: Fix ICCCM/NetWM dialog issues Make this dialog resizable for reading longer text (window titles, etc). Also, fix the layout silliness that was going on by aligning the table entries properly. This dialog looked like crap :( Let's fix that :) --- src/bin/e_int_client_prop.c | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c index 8481b4f0c..4201d860b 100644 --- a/src/bin/e_int_client_prop.c +++ b/src/bin/e_int_client_prop.c @@ -72,6 +72,7 @@ e_int_client_prop(E_Client *ec) if (ec->border_prop_dialog) return; dia = e_dialog_new(NULL, "E", "_window_props"); + e_dialog_resizable_set(dia, 1); e_object_del_attach_func_set(E_OBJECT(dia), _ec_cb_dialog_del); _create_data(dia, ec); @@ -455,30 +456,30 @@ _ec_icccm_create(E_Dialog *dia, void *data EINA_UNUSED) e_widget_toolbook_page_append(otb, NULL, _("General"), o, 1, 1, 1, 1, 0.5, 0.0); o = e_widget_table_add(e_win_evas_win_get(evas), 0); - STR_ENTRY(_("Minimum Size"), 0, 6, icccm.min); - STR_ENTRY(_("Maximum Size"), 0, 7, icccm.max); - STR_ENTRY(_("Base Size"), 0, 8, icccm.base); - STR_ENTRY(_("Resize Steps"), 0, 9, icccm.step); + STR_ENTRY(_("Minimum Size"), 0, 0, icccm.min); + STR_ENTRY(_("Maximum Size"), 0, 1, icccm.max); + STR_ENTRY(_("Base Size"), 0, 2, icccm.base); + STR_ENTRY(_("Resize Steps"), 0, 3, icccm.step); e_widget_toolbook_page_append(otb, NULL, _("Sizing"), o, 1, 1, 1, 1, 0.5, 0.0); o = e_widget_table_add(e_win_evas_win_get(evas), 0); - STR_ENTRY(_("Aspect Ratio"), 2, 0, icccm.aspect); - STR_ENTRY(_("Initial State"), 2, 1, icccm.initial_state); - STR_ENTRY(_("State"), 2, 2, icccm.state); - STR_ENTRY(_("Window ID"), 2, 3, icccm.window_id); - STR_ENTRY(_("Window Group"), 2, 4, icccm.window_group); - STR_ENTRY(_("Transient For"), 2, 5, icccm.transient_for); - STR_ENTRY(_("Client Leader"), 2, 6, icccm.client_leader); - STR_ENTRY(_("Gravity"), 2, 7, icccm.gravity); - STR_ENTRY(_("Command"), 2, 8, icccm.command); + STR_ENTRY(_("Aspect Ratio"), 0, 0, icccm.aspect); + STR_ENTRY(_("Initial State"), 0, 1, icccm.initial_state); + STR_ENTRY(_("State"), 0, 2, icccm.state); + STR_ENTRY(_("Window ID"), 0, 3, icccm.window_id); + STR_ENTRY(_("Window Group"), 0, 4, icccm.window_group); + STR_ENTRY(_("Transient For"), 0, 5, icccm.transient_for); + STR_ENTRY(_("Client Leader"), 0, 6, icccm.client_leader); + STR_ENTRY(_("Gravity"), 0, 7, icccm.gravity); + STR_ENTRY(_("Command"), 0, 8, icccm.command); e_widget_toolbook_page_append(otb, NULL, _("States"), o, 1, 1, 1, 1, 0.5, 0.0); o = e_widget_table_add(e_win_evas_win_get(evas), 0); - CHK_ENTRY(_("Take Focus"), 0, 11, icccm.take_focus); - CHK_ENTRY(_("Accepts Focus"), 0, 12, icccm.accepts_focus); - CHK_ENTRY(_("Urgent"), 0, 13, icccm.urgent); - CHK_ENTRY(_("Request Delete"), 2, 11, icccm.delete_request); - CHK_ENTRY(_("Request Position"), 2, 12, icccm.request_pos); + CHK_ENTRY(_("Take Focus"), 0, 0, icccm.take_focus); + CHK_ENTRY(_("Accepts Focus"), 0, 1, icccm.accepts_focus); + CHK_ENTRY(_("Urgent"), 0, 2, icccm.urgent); + CHK_ENTRY(_("Request Delete"), 2, 0, icccm.delete_request); + CHK_ENTRY(_("Request Position"), 2, 1, icccm.request_pos); e_widget_toolbook_page_append(otb, NULL, _("Settings"), o, 1, 1, 1, 1, 0.5, 0.0); e_widget_toolbook_page_show(otb, 0); @@ -501,19 +502,19 @@ _ec_netwm_create(E_Dialog *dia, void *data EINA_UNUSED) evas = evas_object_evas_get(dia->win); otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale); o = e_widget_table_add(e_win_evas_win_get(evas), 0); - STR_ENTRY(_("Name"), 0, 1, netwm.name); - STR_ENTRY(_("Icon Name"), 0, 2, netwm.icon_name); - STR_ENTRY(_("Stacking"), 0, 3, netwm.stacking); + STR_ENTRY(_("Name"), 0, 0, netwm.name); + STR_ENTRY(_("Icon Name"), 0, 1, netwm.icon_name); + STR_ENTRY(_("Stacking"), 0, 2, netwm.stacking); e_widget_toolbook_page_append(otb, NULL, _("General"), o, 1, 1, 1, 1, 0.5, 0.0); o = e_widget_table_add(e_win_evas_win_get(evas), 0); - CHK_ENTRY(_("Modal"), 0, 4, netwm.modal); - CHK_ENTRY(_("Sticky"), 0, 5, netwm.sticky); - CHK_ENTRY(_("Shaded"), 0, 6, netwm.shaded); - CHK_ENTRY(_("Skip Taskbar"), 0, 7, netwm.skip_taskbar); - CHK_ENTRY(_("Skip Pager"), 0, 8, netwm.skip_pager); - CHK_ENTRY(_("Hidden"), 0, 9, netwm.hidden); - CHK_ENTRY(_("Fullscreen"), 0, 10, netwm.fullscreen); + CHK_ENTRY(_("Modal"), 0, 0, netwm.modal); + CHK_ENTRY(_("Sticky"), 0, 1, netwm.sticky); + CHK_ENTRY(_("Shaded"), 0, 2, netwm.shaded); + CHK_ENTRY(_("Skip Taskbar"), 2, 0, netwm.skip_taskbar); + CHK_ENTRY(_("Skip Pager"), 2, 1, netwm.skip_pager); + CHK_ENTRY(_("Hidden"), 2, 2, netwm.hidden); + CHK_ENTRY(_("Fullscreen"), 2, 3, netwm.fullscreen); e_widget_toolbook_page_append(otb, NULL, _("Settings"), o, 1, 1, 1, 1, 0.5, 0.0); e_widget_toolbook_page_show(otb, 0);