summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-11-28 14:03:05 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-11-28 14:03:05 +0900
commit7acdb30f951566599b4c02f1c9dfd68f88abef3f (patch)
tree704db934b37c8256faa02c0d4a2539cae87187e6
parenta5c98947aea32671269d925733dd5328db8c6760 (diff)
evas/line - fix the line position set problem.
If the line goes to the 0, 0 then it won't be updated. Now it's fixed.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_object_line.c8
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95ee2abefd..a65d1535c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-11-28 ChunEon Park (Hermet)
2
3 * Evas: If the line goes to the 0, 0 then it won't be updated. Now it's
4 fixed.
5
12013-11-26 ChunEon Park (Hermet) 62013-11-26 ChunEon Park (Hermet)
2 7
3 * Evas: Fix the memory corruption introduced by evas fonts_zero. 8 * Evas: Fix the memory corruption introduced by evas fonts_zero.
diff --git a/NEWS b/NEWS
index e5a8bbe65a..2af1d29bd7 100644
--- a/NEWS
+++ b/NEWS
@@ -366,6 +366,7 @@ Fixes:
366 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively. 366 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively.
367 - Evas textblock: Fixed wrapping of lines ending with whites. 367 - Evas textblock: Fixed wrapping of lines ending with whites.
368 - Evas: Fix the memory corruption introduced by evas fonts_zero. 368 - Evas: Fix the memory corruption introduced by evas fonts_zero.
369 - Evas: If the line goes to the 0, 0 then it won't be updated. Now it's fixed.
369 370
370 * Ecore: 371 * Ecore:
371 - Don't leak fd on exec. 372 - Don't leak fd on exec.
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index ccdfa0181d..f5dae37c78 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -126,10 +126,14 @@ _line_xy_set(Eo *eo_obj, void *_pd, va_list *list)
126 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 126 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
127 return; 127 return;
128 MAGIC_CHECK_END(); 128 MAGIC_CHECK_END();
129 if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
130 (x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
131 129
132 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 130 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
131
132 if ((x1 == (obj->cur->geometry.x + o->cur.x1)) &&
133 (y1 == (obj->cur->geometry.y + o->cur.y1)) &&
134 (x2 == (obj->cur->geometry.x + o->cur.x2)) &&
135 (y2 == (obj->cur->geometry.y + o->cur.y2))) return;
136
133 if (!(obj->layer->evas->is_frozen)) 137 if (!(obj->layer->evas->is_frozen))
134 { 138 {
135 if (!evas_event_passes_through(eo_obj, obj) && 139 if (!evas_event_passes_through(eo_obj, obj) &&