summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_text.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-01-10 20:07:51 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-01-17 14:35:30 +0900
commit1b881704dbb5673bb2b7104123a3f8a00ebb43b6 (patch)
tree58ded549ab54a19d67529c3b6f979a18b535a661 /src/lib/evas/canvas/evas_object_text.c
parent277ca9c0fcf6b6559b96f5a0ce711d63605324b5 (diff)
downloadefl-1b881704dbb5673bb2b7104123a3f8a00ebb43b6.tar.gz
evas: Fix classic text styles with filters in textblock
Textblock filters support RGBA input which means legacy styles can be used in conjunction with filtering. Not recommended, but it works. Note: We may decide to drop this behaviour and use alpha-only inputs for simplicity. Still missing: support for filtering strikethrough, underline, or embedded items
Diffstat (limited to 'src/lib/evas/canvas/evas_object_text.c')
-rw-r--r--src/lib/evas/canvas/evas_object_text.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 7329e78d82..01c2b190c7 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1722,6 +1722,7 @@ _evas_text_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj EINA_UNUSED
void *_filter, void *drawctx,
void *data EINA_UNUSED,
int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
+ int x, int y,
Eina_Bool do_async)
{
Evas_Filter_Context *filter = _filter;
@@ -1732,8 +1733,8 @@ _evas_text_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj EINA_UNUSED
{
if (!evas_filter_font_draw(filter, drawctx,
EVAS_FILTER_BUFFER_INPUT_ID, o->font,
- l + it->x,
- t + (int) o->max_ascent,
+ x + l + it->x,
+ y + t + (int) o->max_ascent,
&it->text_props,
do_async))
return EINA_FALSE;