[EGIT] [core/efl] master 01/01: evas - fix textblock handling of effects for shadows and so on in some cases

[Rasterman]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=aba7e9892e395433a2f0f2bdc40c387a75422e51

commit aba7e9892e395433a2f0f2bdc40c387a75422e51
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Oct 15 16:04:40 2013 +0900

    evas - fix textblock handling of effects for shadows and so on in some cases
---
 src/lib/evas/canvas/evas_object_textblock.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index 021f59a..ed2f879 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10934,8 +10934,12 @@ evas_object_textblock_render(Evas_Object *eo_obj 
EINA_UNUSED,
         switch (ti->parent.format->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:
@@ -11032,7 +11036,7 @@ evas_object_textblock_render(Evas_Object *eo_obj 
EINA_UNUSED,
         ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
         if (!ti) continue;
 
-        if (ti->parent.format->style == EVAS_TEXT_STYLE_GLOW)
+        if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == 
EVAS_TEXT_STYLE_GLOW)
           {
              for (j = 0; j < 5; j++)
                {
@@ -11061,9 +11065,9 @@ evas_object_textblock_render(Evas_Object *eo_obj 
EINA_UNUSED,
         ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
         if (!ti) continue;
 
-        if ((ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE) ||
-              (ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
-              (ti->parent.format->style == 
EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
+        if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == 
EVAS_TEXT_STYLE_OUTLINE) ||
+            ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == 
EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
+            ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) == 
EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
           {
              COLOR_SET(outline);
              DRAW_TEXT(-1, 0);

--