summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib/canvas/evas_layer.c
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2011-06-18 09:16:22 +0000
committerChunEon Park <hermet@hermet.pe.kr>2011-06-18 09:16:22 +0000
commita76601e1239e95f68f57fb7a57ff0c1a385df27c (patch)
tree905ad89b509a236c3efbcab351dcb0e845b5fafb /legacy/evas/src/lib/canvas/evas_layer.c
parent8a6f620675d3adafb4269b24973ce2e32a000151 (diff)
evas_layer.c - fixed indenation and removed white spaces
SVN revision: 60472
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_layer.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_layer.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/legacy/evas/src/lib/canvas/evas_layer.c
index 6c3fa0f..c4da799 100644
--- a/legacy/evas/src/lib/canvas/evas_layer.c
+++ b/legacy/evas/src/lib/canvas/evas_layer.c
@@ -12,9 +12,9 @@ evas_object_inject(Evas_Object *obj, Evas *e)
12 lay = evas_layer_find(e, obj->cur.layer); 12 lay = evas_layer_find(e, obj->cur.layer);
13 if (!lay) 13 if (!lay)
14 { 14 {
15 lay = evas_layer_new(e); 15 lay = evas_layer_new(e);
16 lay->layer = obj->cur.layer; 16 lay->layer = obj->cur.layer;
17 evas_layer_add(lay); 17 evas_layer_add(lay);
18 } 18 }
19 lay->objects = (Evas_Object *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj)); 19 lay->objects = (Evas_Object *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj));
20 lay->usage++; 20 lay->usage++;
@@ -30,11 +30,11 @@ evas_object_release(Evas_Object *obj, int clean_layer)
30 obj->layer->usage--; 30 obj->layer->usage--;
31 if (clean_layer) 31 if (clean_layer)
32 { 32 {
33 if (obj->layer->usage <= 0) 33 if (obj->layer->usage <= 0)
34 { 34 {
35 evas_layer_del(obj->layer); 35 evas_layer_del(obj->layer);
36 _evas_layer_free(obj->layer); 36 _evas_layer_free(obj->layer);
37 } 37 }
38 } 38 }
39 obj->layer = NULL; 39 obj->layer = NULL;
40 obj->in_layer = 0; 40 obj->in_layer = 0;
@@ -64,8 +64,8 @@ evas_layer_pre_free(Evas_Layer *lay)
64 64
65 EINA_INLIST_FOREACH(lay->objects, obj) 65 EINA_INLIST_FOREACH(lay->objects, obj)
66 { 66 {
67 if ((!obj->smart.parent) && (!obj->delete_me)) 67 if ((!obj->smart.parent) && (!obj->delete_me))
68 evas_object_del(obj); 68 evas_object_del(obj);
69 } 69 }
70} 70}
71 71
@@ -74,10 +74,10 @@ evas_layer_free_objects(Evas_Layer *lay)
74{ 74{
75 while (lay->objects) 75 while (lay->objects)
76 { 76 {
77 Evas_Object *obj; 77 Evas_Object *obj;
78 78
79 obj = (Evas_Object *)lay->objects; 79 obj = (Evas_Object *)lay->objects;
80 evas_object_free(obj, 0); 80 evas_object_free(obj, 0);
81 } 81 }
82} 82}
83 83
@@ -88,9 +88,9 @@ evas_layer_clean(Evas *e)
88 88
89 while (e->layers) 89 while (e->layers)
90 { 90 {
91 tmp = e->layers; 91 tmp = e->layers;
92 evas_layer_del(tmp); 92 evas_layer_del(tmp);
93 _evas_layer_free(tmp); 93 _evas_layer_free(tmp);
94 } 94 }
95} 95}
96 96
@@ -101,7 +101,7 @@ evas_layer_find(Evas *e, short layer_num)
101 101
102 EINA_INLIST_FOREACH(e->layers, layer) 102 EINA_INLIST_FOREACH(e->layers, layer)
103 { 103 {
104 if (layer->layer == layer_num) return layer; 104 if (layer->layer == layer_num) return layer;
105 } 105 }
106 return NULL; 106 return NULL;
107} 107}
@@ -113,13 +113,13 @@ evas_layer_add(Evas_Layer *lay)
113 113
114 EINA_INLIST_FOREACH(lay->evas->layers, layer) 114 EINA_INLIST_FOREACH(lay->evas->layers, layer)
115 { 115 {
116 if (layer->layer > lay->layer) 116 if (layer->layer > lay->layer)
117 { 117 {
118 lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers), 118 lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers),
119 EINA_INLIST_GET(lay), 119 EINA_INLIST_GET(lay),
120 EINA_INLIST_GET(layer)); 120 EINA_INLIST_GET(layer));
121 return; 121 return;
122 } 122 }
123 } 123 }
124 lay->evas->layers = (Evas_Layer *)eina_inlist_append(EINA_INLIST_GET(lay->evas->layers), EINA_INLIST_GET(lay)); 124 lay->evas->layers = (Evas_Layer *)eina_inlist_append(EINA_INLIST_GET(lay->evas->layers), EINA_INLIST_GET(lay));
125} 125}
@@ -148,8 +148,8 @@ evas_object_layer_set(Evas_Object *obj, short l)
148 if (obj->smart.parent) return; 148 if (obj->smart.parent) return;
149 if (obj->cur.layer == l) 149 if (obj->cur.layer == l)
150 { 150 {
151 evas_object_raise(obj); 151 evas_object_raise(obj);
152 return; 152 return;
153 } 153 }
154 if (l < EVAS_LAYER_MIN) l = EVAS_LAYER_MIN; 154 if (l < EVAS_LAYER_MIN) l = EVAS_LAYER_MIN;
155 else if (l > EVAS_LAYER_MAX) l = EVAS_LAYER_MAX; 155 else if (l > EVAS_LAYER_MAX) l = EVAS_LAYER_MAX;
@@ -161,22 +161,22 @@ evas_object_layer_set(Evas_Object *obj, short l)
161 evas_object_change(obj); 161 evas_object_change(obj);
162 if (obj->clip.clipees) 162 if (obj->clip.clipees)
163 { 163 {
164 evas_object_inform_call_restack(obj); 164 evas_object_inform_call_restack(obj);
165 return; 165 return;
166 } 166 }
167 evas_object_change(obj); 167 evas_object_change(obj);
168 if (!obj->smart.smart) 168 if (!obj->smart.smart)
169 { 169 {
170 if (evas_object_is_in_output_rect(obj, 170 if (evas_object_is_in_output_rect(obj,
171 obj->layer->evas->pointer.x, 171 obj->layer->evas->pointer.x,
172 obj->layer->evas->pointer.y, 1, 1) && 172 obj->layer->evas->pointer.y, 1, 1) &&
173 obj->cur.visible) 173 obj->cur.visible)
174 if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj)) 174 if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj))
175 evas_event_feed_mouse_move(obj->layer->evas, 175 evas_event_feed_mouse_move(obj->layer->evas,
176 obj->layer->evas->pointer.x, 176 obj->layer->evas->pointer.x,
177 obj->layer->evas->pointer.y, 177 obj->layer->evas->pointer.y,
178 obj->layer->evas->last_timestamp, 178 obj->layer->evas->last_timestamp,
179 NULL); 179 NULL);
180 } 180 }
181 evas_object_inform_call_restack(obj); 181 evas_object_inform_call_restack(obj);
182} 182}