From ad89c335359221e0e7d66f28366d6c7c572e0fe4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 May 2013 13:08:52 +0100 Subject: [PATCH] remove unused "modal_windows" option which was breaking dialog focus in some cases --- src/bin/e_border.c | 8 ++++---- src/bin/e_config.c | 1 - src/bin/e_config.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 5f9e51566..43a8ed2e4 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -7074,7 +7074,7 @@ _e_border_eval0(E_Border *bd) bd_leader->group = eina_list_append(bd_leader->group, bd); bd->leader = bd_leader; /* Only set the window modal to the leader it there is no parent */ - if ((e_config->modal_windows) && (bd->client.netwm.state.modal) && + if ((bd->client.netwm.state.modal) && ((!bd->parent) || (bd->parent->modal != bd))) { bd->leader->modal = bd; @@ -7432,7 +7432,7 @@ _e_border_eval0(E_Border *bd) if (bd->parent) { e_border_layer_set(bd, bd->parent->layer); - if ((e_config->modal_windows) && (bd->client.netwm.state.modal)) + if (bd->client.netwm.state.modal) { bd->parent->modal = bd; bd->parent->lock_close = 1; @@ -7826,7 +7826,7 @@ _e_border_eval0(E_Border *bd) } if (bd->parent) { - if ((e_config->modal_windows) && (bd->client.netwm.state.modal)) + if (bd->client.netwm.state.modal) { bd->parent->modal = bd; if (bd->parent->focused) @@ -7835,7 +7835,7 @@ _e_border_eval0(E_Border *bd) } else if (bd->leader) { - if ((e_config->modal_windows) && (bd->client.netwm.state.modal)) + if (bd->client.netwm.state.modal) { bd->leader->modal = bd; if (bd->leader->focused) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 3fd734c75..2db11e399 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -549,7 +549,6 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, transient.layer, INT); /**/ E_CONFIG_VAL(D, T, transient.desktop, INT); /**/ E_CONFIG_VAL(D, T, transient.iconify, INT); /**/ - E_CONFIG_VAL(D, T, modal_windows, INT); /**/ E_CONFIG_VAL(D, T, menu_eap_name_show, INT); /**/ E_CONFIG_VAL(D, T, menu_eap_generic_show, INT); /**/ E_CONFIG_VAL(D, T, menu_eap_comment_show, INT); /**/ diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 031fec322..2369bd34f 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -187,7 +187,6 @@ struct _E_Config int desktop; // GUI int iconify; // GUI } transient; - int modal_windows; int menu_eap_name_show; // GUI int menu_eap_generic_show; // GUI int menu_eap_comment_show; // GUI