From 3700be959b77a2bebe6f24ed80e79075bb74b075 Mon Sep 17 00:00:00 2001 From: "Minwoo, Lee" Date: Mon, 23 Nov 2015 20:53:29 +0900 Subject: [PATCH] evas: Fix text effect which has shadow direction Summary: If text object has outline and shadow effect (OUTLINE_SHADOW or OUTLINE_SOFT_SHADOW), and has shadow direction except BOTTOM_RIGHT then outline is not displayed. So fix logic of style checking. OUTLINE_SOFT_SHADOW effect of text object is different with text block, so fix it. Test Plan: Make text obect with OUTLINE_SHADOW or OUTLINE_SOFT_SHADOW effect with any direction except BOTTOM_RIGHT Reviewers: cedric, woohyun, herdsman, tasn Subscribers: id213sin Differential Revision: https://phab.enlightenment.org/D3047 --- src/lib/evas/canvas/evas_object_text.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 08aa27050b..ff3e761b6a 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -1791,8 +1791,12 @@ evas_object_text_render(Evas_Object *eo_obj, switch (o->cur.style & EVAS_TEXT_STYLE_MASK_BASIC) { case EVAS_TEXT_STYLE_SHADOW: + shad_dst = 1; + haveshad = 1; + break; case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW: shad_dst = 1; + shad_sz = 2; haveshad = 1; break; case EVAS_TEXT_STYLE_OUTLINE_SHADOW: @@ -1909,9 +1913,9 @@ evas_object_text_render(Evas_Object *eo_obj, } /* outlines */ - if ((o->cur.style == EVAS_TEXT_STYLE_OUTLINE) || - (o->cur.style == EVAS_TEXT_STYLE_OUTLINE_SHADOW) || - (o->cur.style == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW)) + if (((o->cur.style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE) || + ((o->cur.style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SHADOW) || + ((o->cur.style & EVAS_TEXT_STYLE_MASK_BASIC) == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW)) { COLOR_SET(o, cur, outline); DRAW_TEXT(-1, 0);