summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2018-11-27 11:24:10 +0900
committerHermet Park <hermetpark@gmail.com>2018-11-27 11:24:10 +0900
commitc9d20d488b7c62f70dd4c05807f854fca76d3fdd (patch)
tree5555988c18c1a70bb5513ae9924c5eb7b5af3c6a /src/lib/evas
parent8a7817cdd9e3a347c301370c2d401a4c5691b6d8 (diff)
Revert "evas map: calc map geometry when it is out of screen"
This reverts commit 8a7817cdd9e3a347c301370c2d401a4c5691b6d8. Sorry, I didn't intend this patch...
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 69e2fcf219..e0f02da945 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -364,29 +364,11 @@ evas_object_clip_recalc_do(Evas_Object_Protected_Data *obj, Evas_Object_Protecte
364 int cx, cy, cw, ch, cr, cg, cb, ca; 364 int cx, cy, cw, ch, cr, cg, cb, ca;
365 int nx, ny, nw, nh, nr, ng, nb, na; 365 int nx, ny, nw, nh, nr, ng, nb, na;
366 Eina_Bool cvis, nvis; 366 Eina_Bool cvis, nvis;
367 Evas_Public_Data *e;
368 367
369 evas_object_coords_recalc(obj->object, obj); 368 evas_object_coords_recalc(obj->object, obj);
370 369
371 if (EINA_UNLIKELY((!!obj->map) && (obj->map->cur.map) && (obj->map->cur.usemap))) 370 if (EINA_UNLIKELY((!!obj->map) && (obj->map->cur.map) && (obj->map->cur.usemap)))
372 { 371 {
373 e = obj->layer->evas;
374 if (!evas_object_is_active(obj->object, obj) &&
375 ((obj->map->cur.map->normal_geometry.x +
376 obj->map->cur.map->normal_geometry.w <= 0) ||
377 (obj->map->cur.map->normal_geometry.y +
378 obj->map->cur.map->normal_geometry.h <= 0) ||
379 (obj->map->cur.map->normal_geometry.x >= e->output.w) ||
380 obj->map->cur.map->normal_geometry.y >= e->output.h))
381 {
382 /* out of screen, but need to calc map geometry to update cache */
383 cy = obj->map->cur.map->normal_geometry.y;
384 cx = obj->map->cur.map->normal_geometry.x;
385 cw = obj->cur->geometry.w;
386 ch = obj->cur->geometry.h;
387 evas_object_map_update(obj->object, cx, cy, cw, ch, cw, ch);
388 }
389
390 cx = obj->map->cur.map->normal_geometry.x; 372 cx = obj->map->cur.map->normal_geometry.x;
391 cy = obj->map->cur.map->normal_geometry.y; 373 cy = obj->map->cur.map->normal_geometry.y;
392 cw = obj->map->cur.map->normal_geometry.w; 374 cw = obj->map->cur.map->normal_geometry.w;