Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_container.c e_desk.c e_object.h e_zone.c
Log Message:
Bugfixes - restore avoid_damage call on new borders, move background blank
object to container level
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_border.c 3 Jan 2005 22:04:04 -0000 1.42
+++ e_border.c 4 Jan 2005 01:32:23 -0000 1.43
@@ -151,7 +151,7 @@
bd->bg_win = ecore_evas_software_x11_window_get(bd->bg_ecore_evas);
ecore_evas_name_class_set(bd->bg_ecore_evas, "E", "Frame_Window");
ecore_evas_title_set(bd->bg_ecore_evas, "Enlightenment Frame");
- /* ecore_evas_avoid_damage_set(bd->bg_ecore_evas, 1); */
+ ecore_evas_avoid_damage_set(bd->bg_ecore_evas, 1);
ecore_evas_show(bd->bg_ecore_evas);
evas_font_path_append(bd->bg_evas, e_path_find(path_data, "fonts"));
bd->client.shell_win = ecore_x_window_override_new(bd->win, 0, 0, 1, 1);
@@ -239,6 +239,7 @@
con->clients = evas_list_append(con->clients, bd);
borders = evas_list_append(borders, bd);
+
return bd;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_container.c 3 Jan 2005 21:10:08 -0000 1.13
+++ e_container.c 4 Jan 2005 01:32:23 -0000 1.14
@@ -37,6 +37,7 @@
{
E_Container *con;
E_Zone *zone;
+ Evas_Object *o;
con = E_OBJECT_ALLOC(E_Container, _e_container_free);
if (!con) return NULL;
@@ -59,6 +60,16 @@
ecore_evas_callback_resize_set(con->bg_ecore_evas,
_e_container_cb_bg_ecore_evas_resize);
+ o = evas_object_rectangle_add(con->bg_evas);
+ con->bg_blank_object = o;
+ evas_object_layer_set(o, -100);
+ evas_object_move(o, 0, 0);
+ evas_object_resize(o, con->w, con->h);
+ evas_object_color_set(o, 255, 255, 255, 255);
+ evas_object_name_set(o, "desktop/background");
+ evas_object_data_set(o, "e_container", con);
+ evas_object_show(o);
+
e_pointer_container_set(con);
/* FIXME: Add ecore code to fetch xinerama screens for zones */
@@ -94,6 +105,7 @@
con->x = x;
con->y = y;
ecore_x_window_move(con->win, con->x, con->y);
+ evas_object_move(con->bg_blank_object, con->x, con->y);
}
void
@@ -105,6 +117,7 @@
con->h = h;
ecore_x_window_resize(con->win, con->w, con->h);
ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
+ evas_object_resize(con->bg_blank_object, con->w, con->h);
}
void
@@ -118,6 +131,8 @@
con->h = h;
ecore_x_window_move_resize(con->win, con->x, con->y, con->w, con->h);
ecore_evas_resize(con->bg_ecore_evas, con->w, con->h);
+ evas_object_move(con->bg_blank_object, con->x, con->y);
+ evas_object_resize(con->bg_blank_object, con->w, con->h);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_desk.c 3 Jan 2005 22:04:04 -0000 1.5
+++ e_desk.c 4 Jan 2005 01:32:23 -0000 1.6
@@ -19,6 +19,7 @@
desk = E_OBJECT_ALLOC(E_Desk, _e_desk_free);
if (!desk) return NULL;
+ desk->clients = NULL;
desk->zone = zone;
desk->num = evas_list_count(zone->desks) + 1;
snprintf(name, sizeof(name), "Desktop %d", desk->num);
@@ -44,12 +45,13 @@
Evas_List *l;
E_OBJECT_CHECK(desk);
-
+ if (desk->visible) return;
+
for (l = desk->zone->clients; l; l = l->next)
{
E_Border *bd = l->data;
- if (desk->clients && evas_list_find(desk->clients, bd))
+ if (bd->desk == desk)
e_border_show(bd);
else
e_border_hide(bd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_object.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_object.h 3 Jan 2005 22:04:46 -0000 1.7
+++ e_object.h 4 Jan 2005 01:32:23 -0000 1.8
@@ -10,8 +10,8 @@
/* OBJECT_CHECK is a simple null pointer and magic number check with no */
/* debug output */
-/* #define OBJECT_PARANOIA_CHECK */
-#define OBJECT_CHECK
+#define OBJECT_PARANOIA_CHECK
+//#define OBJECT_CHECK
#ifndef __GLIBC__
# ifdef OBJECT_PARANOIA_CHECK
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_zone.c 3 Jan 2005 22:04:04 -0000 1.3
+++ e_zone.c 4 Jan 2005 01:32:23 -0000 1.4
@@ -40,14 +40,6 @@
char name[40];
Evas_Object *o;
- o = evas_object_rectangle_add(con->bg_evas);
- zone->bg_blank_object = o;
- evas_object_layer_set(o, -100);
- evas_object_move(o, x, y);
- evas_object_resize(o, w, h);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_show(o);
-
o = edje_object_add(con->bg_evas);
zone->bg_object = o;
evas_object_layer_set(o, -1);
@@ -96,7 +88,6 @@
if ((x == zone->x) && (y == zone->y)) return;
zone->x = x;
zone->y = y;
- evas_object_move(zone->bg_blank_object, x, y);
evas_object_move(zone->bg_object, x, y);
evas_object_move(zone->bg_event_object, x, y);
}
@@ -109,7 +100,6 @@
if ((w == zone->w) && (h == zone->h)) return;
zone->w = w;
zone->h = h;
- evas_object_resize(zone->bg_blank_object, w, h);
evas_object_resize(zone->bg_object, w, h);
evas_object_resize(zone->bg_event_object, w, h);
}
@@ -127,10 +117,8 @@
zone->w = w;
zone->h = h;
- evas_object_move(zone->bg_blank_object, x, y);
evas_object_move(zone->bg_object, x, y);
evas_object_move(zone->bg_event_object, x, y);
- evas_object_resize(zone->bg_blank_object, w, h);
evas_object_resize(zone->bg_object, w, h);
evas_object_resize(zone->bg_event_object, w, h);
}
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
