summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-06 11:19:59 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-06 11:19:59 +0000
commit637f539c9d5f16551bd68329aa3b55ee4da42e8b (patch)
tree328253bd1e99930745b7abeca4d8e47c1c1eaa70
parentd13c7cc1e468904df049f3d719cd1474c9e7550b (diff)
move "allow windows above fullscreen" option to window display dialog
ticket #2216 SVN revision: 83676
Diffstat (limited to '')
-rw-r--r--ChangeLog1
-rw-r--r--NEWS2
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_focus.c9
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_window_geometry.c13
4 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 4999d42b9..bd67543ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 * added api to automatically disable widgets when checkboxes are checked or unchecked 3 * added api to automatically disable widgets when checkboxes are checked or unchecked
4 * added e_widget_on_disable_hook_set 4 * added e_widget_on_disable_hook_set
5 * added option for preventing all keyboard layout changes 5 * added option for preventing all keyboard layout changes
6 * moved "allow windows above fullscreen windows" option to geometry settings dialog
6 7
72013-02-05 Mike Blumenkrantz 82013-02-05 Mike Blumenkrantz
8 9
diff --git a/NEWS b/NEWS
index d6b347921..9fc6316d4 100644
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,6 @@ Changes:
48 Config: 48 Config:
49 * move winlist_warp_speed option to pointer_warp_speed 49 * move winlist_warp_speed option to pointer_warp_speed
50 50
51
52Deprecations: 51Deprecations:
53 * 52 *
54 53
@@ -155,3 +154,4 @@ Fixes:
155 * fix list update on deletion of personal app launchers 154 * fix list update on deletion of personal app launchers
156 * fix button toggling in personal app launchers dialog 155 * fix button toggling in personal app launchers dialog
157 * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf 156 * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
157 * moved "allow windows above fullscreen windows" option to geometry settings dialog
diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c
index 7c687b5d5..fe448d38a 100644
--- a/src/modules/conf_window_manipulation/e_int_config_focus.c
+++ b/src/modules/conf_window_manipulation/e_int_config_focus.c
@@ -32,7 +32,6 @@ struct _E_Config_Dialog_Data
32 double auto_raise_delay; 32 double auto_raise_delay;
33 int border_raise_on_mouse_action; 33 int border_raise_on_mouse_action;
34 int border_raise_on_focus; 34 int border_raise_on_focus;
35 int allow_above_fullscreen;
36}; 35};
37 36
38/* a nice easy setup function that does the dirty work */ 37/* a nice easy setup function that does the dirty work */
@@ -87,7 +86,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
87 cfdata->border_raise_on_mouse_action = 86 cfdata->border_raise_on_mouse_action =
88 e_config->border_raise_on_mouse_action; 87 e_config->border_raise_on_mouse_action;
89 cfdata->border_raise_on_focus = e_config->border_raise_on_focus; 88 cfdata->border_raise_on_focus = e_config->border_raise_on_focus;
90 cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
91} 89}
92 90
93static void * 91static void *
@@ -191,7 +189,6 @@ _advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
191 e_config->auto_raise_delay = cfdata->auto_raise_delay; 189 e_config->auto_raise_delay = cfdata->auto_raise_delay;
192 e_config->border_raise_on_mouse_action = cfdata->border_raise_on_mouse_action; 190 e_config->border_raise_on_mouse_action = cfdata->border_raise_on_mouse_action;
193 e_config->border_raise_on_focus = cfdata->border_raise_on_focus; 191 e_config->border_raise_on_focus = cfdata->border_raise_on_focus;
194 e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
195 e_border_button_bindings_grab_all(); 192 e_border_button_bindings_grab_all();
196 e_config_save_queue(); 193 e_config_save_queue();
197 return 1; /* Apply was OK */ 194 return 1; /* Apply was OK */
@@ -214,8 +211,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c
214 (e_config->use_auto_raise != cfdata->use_auto_raise) || 211 (e_config->use_auto_raise != cfdata->use_auto_raise) ||
215 (e_config->auto_raise_delay != cfdata->auto_raise_delay) || 212 (e_config->auto_raise_delay != cfdata->auto_raise_delay) ||
216 (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) || 213 (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) ||
217 (e_config->border_raise_on_focus != cfdata->border_raise_on_focus) || 214 (e_config->border_raise_on_focus != cfdata->border_raise_on_focus);
218 (e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen);
219} 215}
220 216
221/**--GUI--**/ 217/**--GUI--**/
@@ -302,9 +298,6 @@ _advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Da
302 ob = e_widget_check_add(evas, _("Raise when focusing"), 298 ob = e_widget_check_add(evas, _("Raise when focusing"),
303 &(cfdata->border_raise_on_focus)); 299 &(cfdata->border_raise_on_focus));
304 e_widget_framelist_object_append(of, ob); 300 e_widget_framelist_object_append(of, ob);
305 ob = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
306 &(cfdata->allow_above_fullscreen));
307 e_widget_framelist_object_append(of, ob);
308 e_widget_list_object_append(ol, of, 1, 0, 0.5); 301 e_widget_list_object_append(ol, of, 1, 0, 0.5);
309 e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol, 302 e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol,
310 1, 0, 1, 0, 0.5, 0.0); 303 1, 0, 1, 0, 0.5, 0.0);
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index 3a24639c9..b4ebad98e 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -41,6 +41,7 @@ struct _E_Config_Dialog_Data
41 int maximize_direction; 41 int maximize_direction;
42 int maximized_allow_manip; 42 int maximized_allow_manip;
43 int border_fix_on_shelf_toggle; 43 int border_fix_on_shelf_toggle;
44 int allow_above_fullscreen;
44}; 45};
45 46
46E_Config_Dialog * 47E_Config_Dialog *
@@ -88,6 +89,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
88 cfdata->transient.desktop = e_config->transient.desktop; 89 cfdata->transient.desktop = e_config->transient.desktop;
89 cfdata->transient.iconify = e_config->transient.iconify; 90 cfdata->transient.iconify = e_config->transient.iconify;
90 cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE); 91 cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE);
92 cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen;
91 if (cfdata->maximize_policy == E_MAXIMIZE_NONE) 93 if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
92 cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN; 94 cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
93 cfdata->maximize_direction = 95 cfdata->maximize_direction =
@@ -130,6 +132,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
130 (cfdata->maximize_policy | cfdata->maximize_direction); 132 (cfdata->maximize_policy | cfdata->maximize_direction);
131 e_config->allow_manip = cfdata->maximized_allow_manip; 133 e_config->allow_manip = cfdata->maximized_allow_manip;
132 e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle; 134 e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle;
135 e_config->allow_above_fullscreen = cfdata->allow_above_fullscreen;
133 e_config_save_queue(); 136 e_config_save_queue();
134 return 1; /* Apply was OK */ 137 return 1; /* Apply was OK */
135} 138}
@@ -157,7 +160,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
157 (e_config->transient.iconify != cfdata->transient.iconify) || 160 (e_config->transient.iconify != cfdata->transient.iconify) ||
158 (e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) || 161 (e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) ||
159 (e_config->allow_manip != cfdata->maximized_allow_manip) || 162 (e_config->allow_manip != cfdata->maximized_allow_manip) ||
160 (e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle)); 163 (e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle) ||
164 (e_config->allow_above_fullscreen != cfdata->allow_above_fullscreen));
161} 165}
162 166
163static Evas_Object * 167static Evas_Object *
@@ -219,9 +223,14 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
219 ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg); 223 ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg);
220 e_widget_framelist_object_append(of, ow); 224 e_widget_framelist_object_append(of, ow);
221 e_widget_list_object_append(ol, of, 1, 0, 0.5); 225 e_widget_list_object_append(ol, of, 1, 0, 0.5);
226 of = e_widget_framelist_add(evas, _("Manipulation"), 0);
222 ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"), 227 ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"),
223 &(cfdata->maximized_allow_manip)); 228 &(cfdata->maximized_allow_manip));
224 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 229 e_widget_framelist_object_append(of, ow);
230 ow = e_widget_check_add(evas, _("Allow windows above fullscreen window"),
231 &(cfdata->allow_above_fullscreen));
232 e_widget_framelist_object_append(of, ow);
233 e_widget_list_object_append(ol, of, 1, 0, 0.5);
225 e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol, 234 e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol,
226 1, 0, 1, 0, 0.5, 0.0); 235 1, 0, 1, 0, 0.5, 0.0);
227 236