enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

backport previous fullscreen window stacking option move commit 

SVN revision: 83678
This commit is contained in:
Mike Blumenkrantz 2013-02-06 11:22:33 +00:00
parent 2143948e0e
commit f8ec5816c5
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2013-02-06 Mike Blumenkrantz
* moved "allow windows above fullscreen windows" option to geometry settings dialog
2013-02-05 Mike Blumenkrantz
* fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
* remove unnecessary shelf deletion when changing resolution
2013-02-04 Mike Blumenkrantz

2
NEWS
View File

@ -23,6 +23,8 @@ Fixes:
* fix possible crash in xkb rule parsing
* fix list update on deletion of personal app launchers
* fix button toggling in personal app launchers dialog
* fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
* moved "allow windows above fullscreen windows" option to geometry settings dialog
Changes since 0.17.0:

9
src/modules/conf_window_manipulation/e_int_config_focus.c
View File

@ -31,7 +31,6 @@ struct _E_Config_Dialog_Data
double auto_raise_delay;
int border_raise_on_mouse_action;
int border_raise_on_focus;
int allow_above_fullscreen;
Eina_List *autoraise_list;
};
@ -85,7 +84,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->border_raise_on_mouse_action =
e_config->border_raise_on_mouse_action;
cfdata->border_raise_on_focus = e_config->border_raise_on_focus;
cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
}
static void *
@ -186,7 +184,6 @@ _advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
e_config->auto_raise_delay = cfdata->auto_raise_delay;
e_config->border_raise_on_mouse_action = cfdata->border_raise_on_mouse_action;
e_config->border_raise_on_focus = cfdata->border_raise_on_focus;
e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
e_border_button_bindings_grab_all();
e_config_save_queue();
return 1; /* Apply was OK */
@ -207,8 +204,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
(e_config->use_auto_raise != cfdata->use_auto_raise) ||
(e_config->auto_raise_delay != cfdata->auto_raise_delay) ||
(e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) ||
(e_config->border_raise_on_focus != cfdata->border_raise_on_focus) ||
(e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen));
(e_config->border_raise_on_focus != cfdata->border_raise_on_focus));
}
/**--GUI--**/
@ -298,9 +294,6 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
ob = e_widget_check_add(evas, _("Raise when focusing"),
&(cfdata->border_raise_on_focus));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
&(cfdata->allow_above_fullscreen));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(ol, of, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol,
1, 0, 1, 0, 0.5, 0.0);

14
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
View File

@ -42,7 +42,7 @@ struct _E_Config_Dialog_Data
int maximize_direction;
int maximized_allow_manip;
int border_fix_on_shelf_toggle;
int allow_above_fullscreen;
Eina_List *resistance_list;
};
@ -91,6 +91,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
cfdata->transient.desktop = e_config->transient.desktop;
cfdata->transient.iconify = e_config->transient.iconify;
cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE);
cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
cfdata->maximize_direction =
@ -134,6 +135,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
(cfdata->maximize_policy | cfdata->maximize_direction);
e_config->allow_manip = cfdata->maximized_allow_manip;
e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle;
e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
e_config_save_queue();
return 1; /* Apply was OK */
}
@ -161,7 +163,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(e_config->transient.iconify != cfdata->transient.iconify) ||
(e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) ||
(e_config->allow_manip != cfdata->maximized_allow_manip) ||
(e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle));
(e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle) ||
(e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen));
}
static Evas_Object *
@ -231,9 +234,14 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 0, 0.5);
of = e_widget_framelist_add(evas, _("Manipulation"), 0);
ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"),
&(cfdata->maximized_allow_manip));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
&(cfdata->allow_above_fullscreen));
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol,
1, 0, 1, 0, 0.5, 0.0);