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.

diff --git a/ChangeLog b/ChangeLog
index 95ee2ab..a65d153 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-28  ChunEon Park (Hermet)
+
+        * Evas: If the line goes to the 0, 0 then it won't be updated. Now it's
+        fixed.
+
 2013-11-26  ChunEon Park (Hermet)
 
         * Evas: Fix the memory corruption introduced by evas fonts_zero.

diff --git a/NEWS b/NEWS
index e5a8bbe..2af1d29 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -366,6 +366,7 @@ Fixes:
      - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively.
      - Evas textblock: Fixed wrapping of lines ending with whites.
      - Evas: Fix the memory corruption introduced by evas fonts_zero.
+     - Evas: If the line goes to the 0, 0 then it won't be updated. Now it's fixed.
 
     * Ecore:
      - 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 ccdfa01..f5dae37 100644 (file)
--- 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)
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
    MAGIC_CHECK_END();
-   if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
-       (x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
 
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+
+   if ((x1 == (obj->cur->geometry.x + o->cur.x1)) &&
+       (y1 == (obj->cur->geometry.y + o->cur.y1)) &&
+       (x2 == (obj->cur->geometry.x + o->cur.x2)) &&
+       (y2 == (obj->cur->geometry.y + o->cur.y2))) return;
+
    if (!(obj->layer->evas->is_frozen))
      {
         if (!evas_event_passes_through(eo_obj, obj) &&