summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2013-11-01 11:09:58 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-11-01 11:12:01 +0900
commitcdb86e34bbf82bd91aefd686bfc3bdf2a018a956 (patch)
tree3927eb5e08a1c5d6867e753daab56c316ff9759b
parent3973ecf2e80b0546bcd26cc7a56b6719f0263fee (diff)
Evas: Fixed textblock rendering to properly set render operation on context.
Render operation are not well tested. It appears that it was never properly setted on a textblock, this would lead to see it rendered with the render operation of another object. Test Plan: Add some rectangle object with textblock object. The textblock style should be set to "backing=on backing_color=#ffffffff". Set render operation to some rectangle with "evas_object_render_op_set(rect, EVAS_RENDER_COPY)". Check the textblock. Reviewers: woohyun, cedric, raster Reviewed By: cedric CC: cedric Differential Revision: https://phab.enlightenment.org/D277 Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c1
3 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5042ad8fb..911499155c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
12013-10-24 Sung W. Park (sung_) 12013-10-24 Sung W. Park (sung_)
2 * EvasGL: Fixed direct rendering mode not clipping to its clip region. 2 * EvasGL: Fixed direct rendering mode not clipping to its clip region.
3 3
42013-10-24 Youngbok Shin
5
6 * Evas: Fix textblock rendering to properly set render operation on the context.
7
42013-10-18 Youngbok Shin 82013-10-18 Youngbok Shin
5 9
6 * Fixed the textblock format to be drawn according to 10 * Fixed the textblock format to be drawn according to
diff --git a/NEWS b/NEWS
index 99ca54a673..2b4f923a81 100644
--- a/NEWS
+++ b/NEWS
@@ -358,6 +358,7 @@ Fixes:
358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving). 358 - Evas textblock: fixed an issue with markup_get and markup_to_utf8 behaving differently (markup_get was misbehaving).
359 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself. 359 - Fixed the map surface to be updated properly. By tranversing the whole of the map target's tree, it decides to update the map surface to be redrawn if one of the objects is changed except the clipper itself.
360 - Fixed the textblock format to be drawn according to the glyph's horizontal advance width. 360 - Fixed the textblock format to be drawn according to the glyph's horizontal advance width.
361 - Fixed the textblock set to context with the textblock object's render operation.
361 362
362 * Ecore: 363 * Ecore:
363 - Don't leak fd on exec. 364 - Don't leak fd on exec.
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 0566f9303f..0c01a86a5b 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10726,6 +10726,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
10726 /* render object to surface with context, and offxet by x,y */ 10726 /* render object to surface with context, and offxet by x,y */
10727 obj->layer->evas->engine.func->context_multiplier_unset(output, 10727 obj->layer->evas->engine.func->context_multiplier_unset(output,
10728 context); 10728 context);
10729 ENFN->context_render_op_set(output, context, obj->cur->render_op);
10729 /* FIXME: This clipping is just until we fix inset handling correctly. */ 10730 /* FIXME: This clipping is just until we fix inset handling correctly. */
10730 ENFN->context_clip_clip(output, context, 10731 ENFN->context_clip_clip(output, context,
10731 obj->cur->geometry.x + x, 10732 obj->cur->geometry.x + x,