Merge "Don't force transparent text to be high contrast"

2016-02-05 01:12:48 +00:00
parent fbaa5a8c04 edf71a96c9
commit 9bab9e8656
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -510,7 +510,7 @@ public:

        size_t glyphCount = end - start;

-        if (CC_UNLIKELY(canvas->isHighContrastText())) {
+        if (CC_UNLIKELY(canvas->isHighContrastText() && paint.getAlpha() != 0)) {
            // high contrast draw path
            int color = paint.getColor();
            int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color);