styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused "modal_windows" option which was breaking dialog focus in some cases

This commit is contained in:
Mike Blumenkrantz 2013-05-10 13:08:52 +01:00
parent b797b4bb1b
commit ad89c33535
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_border.c
View File

@ -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)

1
src/bin/e_config.c
View File

@ -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); /**/

1
src/bin/e_config.h
View File

@ -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