Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_config.c e_int_config_desklock.c
e_int_config_window_manipulation.c
Log Message:
* improving maximization behavior. i.e. if the window is maximized vertically,
it is not denied to maximize it horizontally.
* fixing some mess between basic/advanced window manipulation cfg dialogs.
* fixing initial keybindings.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_actions.c 8 Jun 2006 09:29:53 -0000 1.65
+++ e_actions.c 9 Jun 2006 22:15:11 -0000 1.66
@@ -379,9 +379,19 @@
if (sscanf(params, "%20s %20s", s1, s2) == 2)
{
if (!strcmp(s2, "vertical"))
- e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
+ {
+ if (bd->maximized & E_MAXIMIZE_VERTICAL)
+ e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
+ else
+ goto maximize;
+ }
else if (!strcmp(s2, "horizontal"))
- e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
+ {
+ if (bd->maximized & E_MAXIMIZE_HORIZONTAL)
+ e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
+ else
+ goto maximize;
+ }
else
e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
}
@@ -390,7 +400,8 @@
}
}
else
- {
+ {
+ maximize:
if (!params)
e_border_maximize(bd, e_config->maximize_policy);
else
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -3 -r1.180 -r1.181
--- e_config.c 8 Jun 2006 15:15:57 -0000 1.180
+++ e_config.c 9 Jun 2006 22:15:11 -0000 1.181
@@ -779,10 +779,10 @@
"window_maximized_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_ALT, 0,
- "window_maximized_toggle", "vertical");
+ "window_maximized_toggle", "default vertical");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_CTRL, 0,
- "window_maximized_toggle", "horizontal");
+ "window_maximized_toggle", "default horizontal");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "r",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_shaded_toggle", NULL);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_int_config_desklock.c 8 Jun 2006 19:35:39 -0000 1.20
+++ e_int_config_desklock.c 9 Jun 2006 22:15:11 -0000 1.21
@@ -543,7 +543,7 @@
_ibg_list_cb_bg_selected, cfdata,
DEF_DESKLOCK_BACKGROUND);
}
- if ((e_config->desklock_background) &&
+ if ((!e_config->desklock_background) ||
(!strcmp(e_config->desklock_background, DEF_DESKLOCK_BACKGROUND)))
e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_window_manipulation.c 7 Jun 2006 23:30:12 -0000 1.10
+++ e_int_config_window_manipulation.c 9 Jun 2006 22:15:11 -0000 1.11
@@ -99,8 +99,8 @@
/* Actually take our cfdata settings and apply them in real life */
e_config->use_auto_raise = cfdata->use_auto_raise;
e_config->use_resist = cfdata->use_resist;
- e_config->maximize_policy &= ~E_MAXIMIZE_TYPE;
- e_config->maximize_policy &= cfdata->maximize_policy;
+ //e_config->maximize_policy &= ~E_MAXIMIZE_TYPE;
+ e_config->maximize_policy = cfdata->maximize_policy |
cfdata->maximize_direction;
e_config_save_queue();
return 1; /* Apply was OK */
}
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
