From 44c92b837a45b476cda062b5a19d3fbbfa669395 Mon Sep 17 00:00:00 2001
From: Alexander Shalamov <alexander.shalamov@mapbox.com>
Date: Tue, 9 Jul 2019 14:10:54 +0300
Subject: [core] Break lines for vertical writing mode

---
 src/mbgl/text/shaping.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp
index 132f74661e..3ed35fc725 100644
--- a/src/mbgl/text/shaping.cpp
+++ b/src/mbgl/text/shaping.cpp
@@ -238,9 +238,8 @@ std::set<std::size_t> leastBadBreaks(const PotentialBreak& lastLineBreak) {
 std::set<std::size_t> determineLineBreaks(const TaggedString& logicalInput,
                                           const float spacing,
                                           float maxWidth,
-                                          const WritingModeType writingMode,
                                           const GlyphMap& glyphMap) {
-    if (!maxWidth || writingMode != WritingModeType::Horizontal) {
+    if (!maxWidth) {
         return {};
     }
     
@@ -382,13 +381,13 @@ const Shaping getShaping(const TaggedString& formattedString,
     std::vector<TaggedString> reorderedLines;
     if (formattedString.sectionCount() == 1) {
         auto untaggedLines = bidi.processText(formattedString.rawText(),
-                                              determineLineBreaks(formattedString, spacing, maxWidth, writingMode, glyphs));
+                                              determineLineBreaks(formattedString, spacing, maxWidth, glyphs));
         for (const auto& line : untaggedLines) {
             reorderedLines.emplace_back(line, formattedString.sectionAt(0));
         }
     } else {
         auto processedLines = bidi.processStyledText(formattedString.getStyledText(),
-                                                     determineLineBreaks(formattedString, spacing, maxWidth, writingMode, glyphs));
+                                                     determineLineBreaks(formattedString, spacing, maxWidth, glyphs));
         for (const auto& line : processedLines) {
             reorderedLines.emplace_back(line, formattedString.getSections());
         }
-- 
cgit v1.2.1