summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib/canvas/evas_layer.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2005-05-22 02:49:50 +0000
committerCarsten Haitzler <raster@rasterman.com>2005-05-22 02:49:50 +0000
commit46e02cf8bb14545bf73586145d52603b8fafd435 (patch)
tree01e271f53f8c8365bcad7195b3a55fa7ab54dbf5 /legacy/evas/src/lib/canvas/evas_layer.c
parent2a6937cccbf90e16710dc46562249fb3d9405f39 (diff)
whitespace
SVN revision: 14889
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_layer.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_layer.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/legacy/evas/src/lib/canvas/evas_layer.c
index cfc7c1c..a9a20d0 100644
--- a/legacy/evas/src/lib/canvas/evas_layer.c
+++ b/legacy/evas/src/lib/canvas/evas_layer.c
@@ -6,7 +6,7 @@ void
6evas_object_inject(Evas_Object *obj, Evas *e) 6evas_object_inject(Evas_Object *obj, Evas *e)
7{ 7{
8 Evas_Layer *lay; 8 Evas_Layer *lay;
9 9
10 lay = evas_layer_find(e, obj->cur.layer); 10 lay = evas_layer_find(e, obj->cur.layer);
11 if (!lay) 11 if (!lay)
12 { 12 {
@@ -14,7 +14,7 @@ evas_object_inject(Evas_Object *obj, Evas *e)
14 lay->layer = obj->cur.layer; 14 lay->layer = obj->cur.layer;
15 evas_layer_add(lay); 15 evas_layer_add(lay);
16 } 16 }
17 lay->objects = evas_object_list_append(lay->objects, obj); 17 lay->objects = evas_object_list_append(lay->objects, obj);
18 obj->layer = lay; 18 obj->layer = lay;
19} 19}
20 20
@@ -37,7 +37,7 @@ Evas_Layer *
37evas_layer_new(Evas *e) 37evas_layer_new(Evas *e)
38{ 38{
39 Evas_Layer *lay; 39 Evas_Layer *lay;
40 40
41 lay = calloc(1, sizeof(Evas_Layer)); 41 lay = calloc(1, sizeof(Evas_Layer));
42 if (!lay) return NULL; 42 if (!lay) return NULL;
43 lay->evas = e; 43 lay->evas = e;
@@ -48,11 +48,11 @@ void
48evas_layer_pre_free(Evas_Layer *lay) 48evas_layer_pre_free(Evas_Layer *lay)
49{ 49{
50 Evas_Object_List *l; 50 Evas_Object_List *l;
51 51
52 for (l = (Evas_Object_List *)lay->objects; l; l = l->next) 52 for (l = (Evas_Object_List *)lay->objects; l; l = l->next)
53 { 53 {
54 Evas_Object *obj; 54 Evas_Object *obj;
55 55
56 obj = (Evas_Object *)l; 56 obj = (Evas_Object *)l;
57 if (!obj->smart.parent) evas_object_del(obj); 57 if (!obj->smart.parent) evas_object_del(obj);
58 } 58 }
@@ -64,7 +64,7 @@ evas_layer_free(Evas_Layer *lay)
64 while (lay->objects) 64 while (lay->objects)
65 { 65 {
66 Evas_Object *obj; 66 Evas_Object *obj;
67 67
68 obj = (Evas_Object *)lay->objects; 68 obj = (Evas_Object *)lay->objects;
69 evas_object_free(obj, 0); 69 evas_object_free(obj, 0);
70 } 70 }
@@ -75,11 +75,11 @@ Evas_Layer *
75evas_layer_find(Evas *e, int layer_num) 75evas_layer_find(Evas *e, int layer_num)
76{ 76{
77 Evas_Object_List *list; 77 Evas_Object_List *list;
78 78
79 for (list = (Evas_Object_List *)e->layers; list; list = list->next) 79 for (list = (Evas_Object_List *)e->layers; list; list = list->next)
80 { 80 {
81 Evas_Layer *layer; 81 Evas_Layer *layer;
82 82
83 layer = (Evas_Layer *)list; 83 layer = (Evas_Layer *)list;
84 if (layer->layer == layer_num) return layer; 84 if (layer->layer == layer_num) return layer;
85 } 85 }
@@ -90,11 +90,11 @@ void
90evas_layer_add(Evas_Layer *lay) 90evas_layer_add(Evas_Layer *lay)
91{ 91{
92 Evas_Object_List *list; 92 Evas_Object_List *list;
93 93
94 for (list = (Evas_Object_List *)lay->evas->layers; list; list = list->next) 94 for (list = (Evas_Object_List *)lay->evas->layers; list; list = list->next)
95 { 95 {
96 Evas_Layer *layer; 96 Evas_Layer *layer;
97 97
98 layer = (Evas_Layer *)list; 98 layer = (Evas_Layer *)list;
99 if (layer->layer > lay->layer) 99 if (layer->layer > lay->layer)
100 { 100 {
@@ -110,7 +110,7 @@ evas_layer_del(Evas_Layer *lay)
110{ 110{
111 Evas_Object_List *ol; 111 Evas_Object_List *ol;
112 Evas *e; 112 Evas *e;
113 113
114 ol = (Evas_Object_List *)lay; 114 ol = (Evas_Object_List *)lay;
115 e = lay->evas; 115 e = lay->evas;
116 e->layers = evas_object_list_remove(e->layers, lay); 116 e->layers = evas_object_list_remove(e->layers, lay);
@@ -122,7 +122,7 @@ evas_layer_del(Evas_Layer *lay)
122 * @defgroup Evas_Object_Layer_Group Object Layer Functions 122 * @defgroup Evas_Object_Layer_Group Object Layer Functions
123 * 123 *
124 * Functions that retrieve and set the layer that an evas object is on. 124 * Functions that retrieve and set the layer that an evas object is on.
125 * 125 *
126 * @todo Document which way layers go. 126 * @todo Document which way layers go.
127 */ 127 */
128 128
@@ -136,12 +136,12 @@ void
136evas_object_layer_set(Evas_Object *obj, int l) 136evas_object_layer_set(Evas_Object *obj, int l)
137{ 137{
138 Evas *e; 138 Evas *e;
139 139
140 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); 140 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
141 return; 141 return;
142 MAGIC_CHECK_END(); 142 MAGIC_CHECK_END();
143 if (evas_object_intercept_call_layer_set(obj, l)) return; 143 if (evas_object_intercept_call_layer_set(obj, l)) return;
144 if (obj->cur.layer == l) 144 if (obj->cur.layer == l)
145 { 145 {
146 evas_object_raise(obj); 146 evas_object_raise(obj);
147 return; 147 return;
@@ -164,8 +164,8 @@ evas_object_layer_set(Evas_Object *obj, int l)
164 if (!obj->smart.smart) 164 if (!obj->smart.smart)
165 { 165 {
166 evas_object_change(obj); 166 evas_object_change(obj);
167 if (evas_object_is_in_output_rect(obj, 167 if (evas_object_is_in_output_rect(obj,
168 obj->layer->evas->pointer.x, 168 obj->layer->evas->pointer.x,
169 obj->layer->evas->pointer.y, 1, 1) && 169 obj->layer->evas->pointer.y, 1, 1) &&
170 obj->cur.visible) 170 obj->cur.visible)
171 if (evas_list_find(obj->layer->evas->pointer.object.in, obj)) 171 if (evas_list_find(obj->layer->evas->pointer.object.in, obj))