From dc48107c80a41107d41ca621b9b0111ef6826e05 Mon Sep 17 00:00:00 2001 From: raster Date: Sat, 11 Apr 2009 07:10:26 +0000 Subject: [PATCH] revert - spotted clip bug in titlebar in e17. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@39966 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_main.c | 1 - src/lib/include/evas_inline.x | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_object_main.c b/src/lib/canvas/evas_object_main.c index 4a29994..0bfdb2d 100644 --- a/src/lib/canvas/evas_object_main.c +++ b/src/lib/canvas/evas_object_main.c @@ -1202,7 +1202,6 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) obj->cur.color.r = r; obj->cur.color.g = g; obj->cur.color.b = b; - evas_object_clip_dirty(obj); if ((obj->cur.color.a == 0) && (a == 0)) return; obj->cur.color.a = a; evas_object_change(obj); diff --git a/src/lib/include/evas_inline.x b/src/lib/include/evas_inline.x index 410567f..1a498f3 100644 --- a/src/lib/include/evas_inline.x +++ b/src/lib/include/evas_inline.x @@ -172,8 +172,7 @@ evas_object_clip_recalc(Evas_Object *obj) int nx, ny, nw, nh, nvis, nr, ng, nb, na; if (obj->layer->evas->events_frozen > 0) return; - if (!(obj->cur.clipper == NULL || obj->cur.clipper->cur.cache.clip.dirty) - && !obj->cur.cache.clip.dirty) return; +// if (!obj->cur.clipper->cur.cache.clip.dirty) return; evas_object_coords_recalc(obj); cx = obj->cur.geometry.x; cy = obj->cur.geometry.y; cw = obj->cur.geometry.w; ch = obj->cur.geometry.h; @@ -186,7 +185,7 @@ evas_object_clip_recalc(Evas_Object *obj) if (obj->cur.clipper) { // this causes problems... hmmm - if (obj->cur.clipper->cur.cache.clip.dirty) +// if (obj->cur.clipper->cur.cache.clip.dirty) evas_object_clip_recalc(obj->cur.clipper); nx = obj->cur.clipper->cur.cache.clip.x; ny = obj->cur.clipper->cur.cache.clip.y; -- 2.7.4