Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_container.c e_container.h
Log Message:
Raise the border on click, even if move/resize is disabled.
Don't make the container black, need to do this pr. desk.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -3 -r1.268 -r1.269
--- e_border.c 18 Jun 2005 12:51:00 -0000 1.268
+++ e_border.c 18 Jun 2005 13:03:00 -0000 1.269
@@ -1093,6 +1093,9 @@
e_border_raise(bd);
switch (e_config->maximize_policy)
{
+ case E_MAXIMIZE_NONE:
+ /* Ignore */
+ break;
case E_MAXIMIZE_ZOOM:
/* FIXME */
break;
@@ -1195,6 +1198,9 @@
switch (bd->maximized)
{
+ case E_MAXIMIZE_NONE:
+ /* Ignore */
+ break;
case E_MAXIMIZE_ZOOM:
/* FIXME */
break;
@@ -1232,7 +1238,7 @@
/* FIXME */
break;
}
- bd->maximized = 0;
+ bd->maximized = E_MAXIMIZE_NONE;
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w,
bd->saved.h);
@@ -1255,9 +1261,6 @@
{
int x, y, w, h;
// printf("FULLSCREEEN!\n");
- /* make container bg black and show it */
- e_container_bg_black(bd->zone->container);
-
bd->saved.x = bd->x;
bd->saved.y = bd->y;
bd->saved.w = bd->w;
@@ -1295,9 +1298,6 @@
if (bd->fullscreen)
{
// printf("UNFULLSCREEEN!\n");
- /* make container bg white and hide it */
- e_container_bg_white(bd->zone->container);
-
e_hints_window_fullscreen_set(bd, 0);
bd->fullscreen = 0;
@@ -1555,7 +1555,6 @@
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
_e_border_moveinfo_gather(bd, source);
}
- e_border_raise(bd);
}
}
@@ -1610,7 +1609,6 @@
snprintf(source, sizeof(source) - 1, "mouse,%i", ev->button);
_e_border_moveinfo_gather(bd, source);
}
- e_border_raise(bd);
}
}
@@ -2649,7 +2647,6 @@
return;
bd->moving = 1;
_e_border_moveinfo_gather(bd, source);
- e_border_raise(bd);
}
static void
@@ -5025,6 +5022,7 @@
{
int w, h;
+ e_border_raise(bd);
if ((bd->shaded) || (bd->shading) ||
(bd->maximized) || (bd->fullscreen))
return 0;
@@ -5099,6 +5097,7 @@
static int
_e_border_move_begin(E_Border *bd)
{
+ e_border_raise(bd);
if ((bd->maximized) || (bd->fullscreen))
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- e_container.c 18 Jun 2005 05:08:17 -0000 1.67
+++ e_container.c 18 Jun 2005 13:03:00 -0000 1.68
@@ -292,26 +292,6 @@
#endif
}
-void
-e_container_bg_black(E_Container *con)
-{
- Evas_Object *o;
-
- o = con->bg_blank_object;
- evas_object_layer_set(o, 100);
- evas_object_color_set(o, 0, 0, 0, 255);
-}
-
-void
-e_container_bg_white(E_Container *con)
-{
- Evas_Object *o;
-
- o = con->bg_blank_object;
- evas_object_layer_set(o, -100);
- evas_object_color_set(o, 255, 255, 255, 255);
-}
-
E_Zone *
e_container_zone_at_point_get(E_Container *con, int x, int y)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_container.h 18 Jun 2005 05:08:17 -0000 1.24
+++ e_container.h 18 Jun 2005 13:03:00 -0000 1.25
@@ -98,9 +98,6 @@
EAPI void e_container_move_resize(E_Container *con, int x, int y, int
w, int h);
EAPI void e_container_raise(E_Container *con);
EAPI void e_container_lower(E_Container *con);
-EAPI void e_container_bg_black(E_Container *con);
-EAPI void e_container_bg_white(E_Container *con);
-
EAPI E_Border_List *e_container_border_list_first(E_Container *con);
EAPI E_Border_List *e_container_border_list_last(E_Container *con);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
