Fix applying Markup Bold caused double bolding

Change-Id: I7344475f64fa749d50404e3795bf67566607fdfa

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
index 614162c..11075b6 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
@@ -773,17 +773,17 @@ int UtcDaliTextSoftwareStyling(void)
 
   struct GlyphInfoData glyphs01[] =
     {
-      {4u, 38u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f, true, true},
-      {4u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
-      {4u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
-      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+      {4u, 38u, 0.f, 0.f, 0.f, 0.f, 11.f, 0.f, true, false},
+      {4u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
+      {4u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
+      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
     };
   struct GlyphInfoData glyphs02[] =
     {
       {1u, 38u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, false},
-      {2u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, true},
+      {2u, 39u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, false, false},
       {3u, 40u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
-      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, true},
+      {4u, 41u, 0.f, 0.f, 0.f, 0.f, 10.f, 0.f, true, false},
     };
 
   CharacterIndex characterIndices[]   = {0u, 1u, 2u, 3u};

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
index 36125c5..94fa9df 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-TextSpannable.cpp
@@ -480,7 +480,7 @@ int UtcDaliToolkitTextLabelSetSpannedText_BoldSpan(void)
   DALI_TEST_EQUALS(validFonts.Count(), 2, TEST_LOCATION);
   DALI_TEST_EQUALS(validFonts[0].characterRun.characterIndex, 0, TEST_LOCATION);
   DALI_TEST_EQUALS(validFonts[0].characterRun.GetEndCharacterIndex(), 3, TEST_LOCATION);
-  DALI_TEST_EQUALS(validFonts[0].isBoldRequired, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(validFonts[0].isBoldRequired, false, TEST_LOCATION);
   END_TEST;
 }
 

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index c5a823a..8abc3af 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -681,6 +681,22 @@ void MultilanguageSupport::ValidateFonts(TextAbstraction::FontClient&
     FontId fontId = fontClient.GetFontId(currentFontDescription, currentFontPointSize);
     currentFontId = fontId;
 
+    // Prevent double-bolding from both markup and style
+    bool isFontChangedByBold = false;
+
+    if(currentFontDescription.weight == TextAbstraction::FontWeight::BOLD)
+    {
+      TextAbstraction::FontDescription currentFontDescriptionWithoutBold = TextAbstraction::FontDescription(currentFontDescription);
+      currentFontDescriptionWithoutBold.weight = TextAbstraction::FontWeight::NORMAL;
+
+      FontId fontIdWithoutBold = fontClient.GetFontId(currentFontDescriptionWithoutBold, currentFontPointSize);
+      if(fontId != fontIdWithoutBold)
+      {
+        // If a font is already changed by the bold feature, do not let Freetype further embolden it.
+        isFontChangedByBold = true;
+      }
+    }
+
     // Get the script for the current character.
     Script script = GetScript(index,
                               scriptRunIt,
@@ -825,7 +841,7 @@ void MultilanguageSupport::ValidateFonts(TextAbstraction::FontClient&
     }
 
     // Whether bols style is required.
-    isBoldRequired = (currentFontDescription.weight >= TextAbstraction::FontWeight::BOLD);
+    isBoldRequired = (!isFontChangedByBold && (currentFontDescription.weight >= TextAbstraction::FontWeight::BOLD));
 
     // Whether italic style is required.
     isItalicRequired = (currentFontDescription.slant >= TextAbstraction::FontSlant::ITALIC);