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)
downloadefl-7acdb30f951566599b4c02f1c9dfd68f88abef3f.tar.gz
efl-7acdb30f951566599b4c02f1c9dfd68f88abef3f.tar.bz2
efl-7acdb30f951566599b4c02f1c9dfd68f88abef3f.zip
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 @@
+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 e5a8bbe65a..2af1d29bd7 100644
--- 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 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)
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) &&