Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h
Log Message:
patches patches...
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -3 -r1.333 -r1.334
--- e_border.c 12 Jul 2005 17:51:03 -0000 1.333
+++ e_border.c 13 Jul 2005 02:59:30 -0000 1.334
@@ -85,6 +85,7 @@
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item
*mi);
@@ -1979,6 +1980,11 @@
e_object_del(E_OBJECT(bd->border_remember_menu));
bd->border_remember_menu = NULL;
}
+ if (bd->border_stacking_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_stacking_menu));
+ bd->border_stacking_menu = NULL;
+ }
if (focused == bd)
{
// ecore_x_window_focus(bd->zone->container->manager->root);
@@ -5081,6 +5087,11 @@
e_object_del(E_OBJECT(bd->border_remember_menu));
bd->border_remember_menu = NULL;
}
+ if (bd->border_stacking_menu)
+ {
+ e_object_del(E_OBJECT(bd->border_stacking_menu));
+ bd->border_stacking_menu = NULL;
+ }
bd->border_menu = NULL;
}
e_object_del(E_OBJECT(m));
@@ -5656,6 +5667,43 @@
e_menu_item_separator_set(mi, 1);
NEW_REMEMBER_MI(_("Run this porgram on login"), apply,
E_REMEMBER_APPLY_RUN, _e_border_menu_cb_remember_apply_run);
*/
+
+ m = e_menu_new();
+ bd->border_stacking_menu = m;
+ if (!bd->lock_user_stacking)
+ {
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Always On Top"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 2);
+ e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
+ e_menu_item_icon_edje_set(mi,
+ (char *)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/stack_on_top"),
+ "widgets/border/default/stack_on_top");
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Normal"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 2);
+ e_menu_item_toggle_set(mi, (bd->layer == 100 ? 1 : 0));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd);
+ e_menu_item_icon_edje_set(mi,
+ (char *)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/stack_normal"),
+ "widgets/border/default/stack_normal");
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Always Below"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 2);
+ e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd);
+ e_menu_item_icon_edje_set(mi,
+ (char *)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/stack_below"),
+ "widgets/border/default/stack_below");
+ }
+
m = e_menu_new();
e_object_data_set(E_OBJECT(m), bd);
bd->border_menu = m;
@@ -5737,32 +5785,14 @@
"widgets/border/default/stick"),
"widgets/border/default/stick");
}
-
- if (!bd->lock_user_stacking)
- {
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Always On Top"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
- e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
- e_menu_item_icon_edje_set(mi,
- (char
*)e_theme_edje_file_get("base/theme/borders",
-
"widgets/border/default/on_top"),
- "widgets/border/default/on_top");
- }
-
- if (!bd->lock_user_stacking)
- {
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Always Below"));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0));
- e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd);
- e_menu_item_icon_edje_set(mi,
- (char
*)e_theme_edje_file_get("base/theme/borders",
-
"widgets/border/default/below"),
- "widgets/border/default/below");
- }
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Stacking"));
+ e_menu_item_submenu_set(mi, bd->border_stacking_menu);
+ e_menu_item_icon_edje_set(mi,
+ (char *)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/stacking"),
+ "widgets/border/default/stacking");
if (!bd->lock_border)
{
@@ -5989,12 +6019,7 @@
E_Border *bd;
bd = data;
- if (bd->layer == 150)
- {
- bd->layer = 100;
- e_hints_window_stacking_set(bd, E_STACKING_NONE);
- }
- else
+ if (bd->layer != 150)
{
bd->layer = 150;
e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
@@ -6011,12 +6036,7 @@
E_Border *bd;
bd = data;
- if (bd->layer == 50)
- {
- bd->layer = 100;
- e_hints_window_stacking_set(bd, E_STACKING_NONE);
- }
- else
+ if (bd->layer != 50)
{
bd->layer = 50;
e_hints_window_stacking_set(bd, E_STACKING_BELOW);
@@ -6025,6 +6045,23 @@
}
static void
+_e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ /* FIXME:
+ * - Remember old layer
+ */
+ E_Border *bd;
+
+ bd = data;
+ if (bd->layer != 100)
+ {
+ bd->layer = 100;
+ e_hints_window_stacking_set(bd, E_STACKING_NONE);
+ }
+ e_container_border_raise(bd);
+}
+
+static void
_e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Border *bd;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- e_border.h 12 Jul 2005 17:51:16 -0000 1.95
+++ e_border.h 13 Jul 2005 02:59:31 -0000 1.96
@@ -337,6 +337,7 @@
E_Menu *border_menu;
E_Menu *border_locks_menu;
E_Menu *border_remember_menu;
+ E_Menu *border_stacking_menu;
Evas_List *pending_move_resize;
struct {
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
