summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_main.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 81fc85878d..90b61584f0 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -85,14 +85,14 @@ evas_object_change(Evas_Object *obj)
85 if (obj->changed_move) 85 if (obj->changed_move)
86 { 86 {
87 movch = 1; 87 movch = 1;
88 obj->changed_move = 0; 88 obj->changed_move = EINA_FALSE;
89 if (!obj->changed_nomove) obj->changed_move_only = 1; 89 if (!obj->changed_nomove) obj->changed_move_only = EINA_TRUE;
90 if (obj->changed) return; 90 if (obj->changed) return;
91 } 91 }
92 else 92 else
93 { 93 {
94 obj->changed_move_only = 0; 94 obj->changed_move_only = EINA_FALSE;
95 obj->changed_nomove = 1; 95 obj->changed_nomove = EINA_TRUE;
96 if (obj->changed) return; 96 if (obj->changed) return;
97 } 97 }
98// obj->changed = 1; 98// obj->changed = 1;
@@ -100,7 +100,7 @@ evas_object_change(Evas_Object *obj)
100 /* set changed flag on all objects this one clips too */ 100 /* set changed flag on all objects this one clips too */
101 if (!((movch) && (obj->is_static_clip))) 101 if (!((movch) && (obj->is_static_clip)))
102 { 102 {
103 EINA_LIST_FOREACH(obj->clip.clipees, l, obj2) 103 EINA_LIST_FOREACH(obj->clip.clipees, l, obj2)
104 evas_object_change(obj2); 104 evas_object_change(obj2);
105 } 105 }
106 EINA_LIST_FOREACH(obj->proxy.proxies, l, obj2) 106 EINA_LIST_FOREACH(obj->proxy.proxies, l, obj2)
@@ -198,7 +198,7 @@ evas_object_render_pre_prev_cur_add(Eina_Array *rects, Evas_Object *obj)
198 obj->prev.cache.clip.y, 198 obj->prev.cache.clip.y,
199 obj->prev.cache.clip.w, 199 obj->prev.cache.clip.w,
200 obj->prev.cache.clip.h); 200 obj->prev.cache.clip.h);
201/* 201/*
202 evas_add_rect(rects, 202 evas_add_rect(rects,
203 obj->cur.geometry.x, 203 obj->cur.geometry.x,
204 obj->cur.geometry.y, 204 obj->cur.geometry.y,
@@ -225,7 +225,7 @@ evas_object_clip_changes_clean(Evas_Object *obj)
225{ 225{
226 Eina_Rectangle *r; 226 Eina_Rectangle *r;
227 227
228 EINA_LIST_FREE(obj->clip.changes, r) 228 EINA_LIST_FREE(obj->clip.changes, r)
229 eina_rectangle_free(r); 229 eina_rectangle_free(r);
230} 230}
231 231
@@ -397,7 +397,7 @@ evas_object_del(Evas_Object *obj)
397 397
398 if (obj->ref > 0) 398 if (obj->ref > 0)
399 { 399 {
400 obj->del_ref = 1; 400 obj->del_ref = EINA_TRUE;
401 return; 401 return;
402 } 402 }
403#ifdef EVAS_FRAME_QUEUING 403#ifdef EVAS_FRAME_QUEUING
@@ -407,7 +407,7 @@ evas_object_del(Evas_Object *obj)
407 evas_object_hide(obj); 407 evas_object_hide(obj);
408 if (obj->focused) 408 if (obj->focused)
409 { 409 {
410 obj->focused = 0; 410 obj->focused = EINA_FALSE;
411 obj->layer->evas->focused = NULL; 411 obj->layer->evas->focused = NULL;
412 _evas_object_event_new(); 412 _evas_object_event_new();
413 evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL, _evas_event_counter); 413 evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL, _evas_event_counter);
@@ -458,12 +458,12 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
458 nx = x; 458 nx = x;
459 ny = y; 459 ny = y;
460 460
461 if (!obj->is_frame) 461 if (!obj->is_frame)
462 { 462 {
463 int fx, fy; 463 int fx, fy;
464 464
465 evas_output_framespace_get(obj->layer->evas, &fx, &fy, NULL, NULL); 465 evas_output_framespace_get(obj->layer->evas, &fx, &fy, NULL, NULL);
466 if (!obj->smart.parent) 466 if (!obj->smart.parent)
467 { 467 {
468 nx += fx; 468 nx += fx;
469 ny += fy; 469 ny += fy;
@@ -501,7 +501,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
501 obj->cur.geometry.y = ny; 501 obj->cur.geometry.y = ny;
502 502
503//// obj->cur.cache.geometry.validity = 0; 503//// obj->cur.cache.geometry.validity = 0;
504 obj->changed_move = 1; 504 obj->changed_move = EINA_TRUE;
505 evas_object_change(obj); 505 evas_object_change(obj);
506 evas_object_clip_dirty(obj); 506 evas_object_clip_dirty(obj);
507 obj->doing.in_move--; 507 obj->doing.in_move--;
@@ -541,12 +541,12 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
541 541
542 nw = w; 542 nw = w;
543 nh = h; 543 nh = h;
544 if (!obj->is_frame) 544 if (!obj->is_frame)
545 { 545 {
546 int fw, fh; 546 int fw, fh;
547 547
548 evas_output_framespace_get(obj->layer->evas, NULL, NULL, &fw, &fh); 548 evas_output_framespace_get(obj->layer->evas, NULL, NULL, &fw, &fh);
549 if (!obj->smart.parent) 549 if (!obj->smart.parent)
550 { 550 {
551 nw = w - fw; 551 nw = w - fw;
552 nh = h - fh; 552 nh = h - fh;
@@ -1008,7 +1008,7 @@ evas_object_hide(Evas_Object *obj)
1008 } 1008 }
1009 else 1009 else
1010 { 1010 {
1011/* 1011/*
1012 if (obj->mouse_grabbed > 0) 1012 if (obj->mouse_grabbed > 0)
1013 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; 1013 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
1014 if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) 1014 if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
@@ -1379,8 +1379,8 @@ evas_object_static_clip_get(const Evas_Object *obj)
1379 return obj->is_static_clip; 1379 return obj->is_static_clip;
1380} 1380}
1381 1381
1382EAPI void 1382EAPI void
1383evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame) 1383evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame)
1384{ 1384{
1385 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); 1385 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
1386 return; 1386 return;
@@ -1388,8 +1388,8 @@ evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame)
1388 obj->is_frame = is_frame; 1388 obj->is_frame = is_frame;
1389} 1389}
1390 1390
1391EAPI Eina_Bool 1391EAPI Eina_Bool
1392evas_object_is_frame_object_get(Evas_Object *obj) 1392evas_object_is_frame_object_get(Evas_Object *obj)
1393{ 1393{
1394 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); 1394 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
1395 return EINA_FALSE; 1395 return EINA_FALSE;