Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_menu.c
Log Message:
Fix maximize options
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_int_border_menu.c 25 Jul 2006 03:27:23 -0000 1.37
+++ e_int_border_menu.c 28 Jul 2006 11:17:33 -0000 1.38
@@ -13,6 +13,7 @@
static void _e_border_menu_cb_maximize(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_maximize_vertically(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _e_border_menu_cb_maximize_horizontally(void *data, E_Menu *m,
E_Menu_Item *mi);
+static void _e_border_menu_cb_unmaximize(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -90,7 +91,8 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximize"));
- e_menu_item_check_set(mi, 1);
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_BOTH);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
e_menu_item_icon_edje_set(mi,
@@ -100,8 +102,9 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximize vertically"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_VERTICAL));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_VERTICAL);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_vertically, bd);
e_menu_item_icon_edje_set(mi,
(char
*)e_theme_edje_file_get("base/theme/borders",
@@ -110,13 +113,25 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximize horizontally"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_HORIZONTAL));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_HORIZONTAL);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_horizontally, bd);
e_menu_item_icon_edje_set(mi,
(char
*)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/maximize"),
"widgets/border/default/maximize");
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Unmaximize"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd->maximized & E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_NONE);
+ e_menu_item_callback_set(mi, _e_border_menu_cb_unmaximize, bd);
+ e_menu_item_icon_edje_set(mi,
+ (char
*)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/maximize"),
+ "widgets/border/default/maximize");
}
m = e_menu_new();
@@ -467,12 +482,7 @@
bd = data;
if (!bd->lock_user_maximize)
- {
- if (bd->maximized & E_MAXIMIZE_BOTH)
- e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
- else
- e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_BOTH);
- }
+ e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_BOTH);
}
static void
@@ -483,10 +493,9 @@
bd = data;
if (!bd->lock_user_maximize)
{
- if ((bd->maximized & E_MAXIMIZE_VERTICAL))
- e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
- else
- e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_VERTICAL);
+ if ((bd->maximized & E_MAXIMIZE_HORIZONTAL))
+ e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
+ e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_VERTICAL);
}
}
@@ -498,10 +507,9 @@
bd = data;
if (!bd->lock_user_maximize)
{
- if ((bd->maximized & E_MAXIMIZE_HORIZONTAL))
- e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
- else
- e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_HORIZONTAL);
+ if ((bd->maximized & E_MAXIMIZE_VERTICAL))
+ e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
+ e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
E_MAXIMIZE_HORIZONTAL);
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
