drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[drape] Replace newline with space in StraightTextLayout and PathTextLayout

Browse Source 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-08-19 00:26:26 +03:00
committed by Konstantin Pastbin
parent ca720d7712
commit 06b6c3f794
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/drape_frontend/text_layout.cpp
View File

@@ -281,10 +281,18 @@ dp::TGlyphs TextLayout::GetGlyphs() const
StraightTextLayout::StraightTextLayout(std::string const & text, float fontSize, ref_ptr<dp::TextureManager> textures, StraightTextLayout::StraightTextLayout(std::string const & text, float fontSize, ref_ptr<dp::TextureManager> textures,
dp::Anchor anchor, bool forceNoWrap) dp::Anchor anchor, bool forceNoWrap)
{ {
ASSERT_EQUAL(std::string::npos, text.find('\n'), ("Multiline text is not expected", text)); /*
* TODO Temporary workaround: If the string contains newlines, replace them with whitespaces.
* On the long run, this should be fixed in the map generator and this workaround removed after
* a few months, when maps with buggy data can be expected to have been phased out.
*/
std::string stext = text;
while (stext.find('\n') != std::string::npos)
stext[stext.find('\n')] = ' ';
ASSERT_EQUAL(std::string::npos, stext.find('\n'), ("Multiline text is not expected", stext));
m_textSizeRatio = fontSize * static_cast<float>(VisualParams::Instance().GetFontScale()) / dp::kBaseFontSizePixels; m_textSizeRatio = fontSize * static_cast<float>(VisualParams::Instance().GetFontScale()) / dp::kBaseFontSizePixels;
m_shapedGlyphs = textures->ShapeSingleTextLine(dp::kBaseFontSizePixels, text, &m_glyphRegions); m_shapedGlyphs = textures->ShapeSingleTextLine(dp::kBaseFontSizePixels, stext, &m_glyphRegions);
// TODO(AB): Use ICU's BreakIterator to split text properly in different languages without spaces. // TODO(AB): Use ICU's BreakIterator to split text properly in different languages without spaces.
// TODO(AB): Implement SplitText for RTL languages. // TODO(AB): Implement SplitText for RTL languages.
@@ -378,13 +386,21 @@ PathTextLayout::PathTextLayout(m2::PointD const & tileCenter, std::string const
ref_ptr<dp::TextureManager> textureManager) ref_ptr<dp::TextureManager> textureManager)
: m_tileCenter(tileCenter) : m_tileCenter(tileCenter)
{ {
ASSERT_EQUAL(std::string::npos, text.find('\n'), ("Multiline text is not expected", text)); /*
* TODO Temporary workaround: If the string contains newlines, replace them with whitespaces.
* On the long run, this should be fixed in the map generator and this workaround removed after
* a few months, when maps with buggy data can be expected to have been phased out.
*/
std::string stext = text;
while (stext.find('\n') != std::string::npos)
stext[stext.find('\n')] = ' ';
ASSERT_EQUAL(std::string::npos, stext.find('\n'), ("Multiline text is not expected", stext));
auto const fontScale = static_cast<float>(VisualParams::Instance().GetFontScale()); auto const fontScale = static_cast<float>(VisualParams::Instance().GetFontScale());
m_textSizeRatio = fontSize * fontScale / dp::kBaseFontSizePixels; m_textSizeRatio = fontSize * fontScale / dp::kBaseFontSizePixels;
// TODO(AB): StraightTextLayout used a logic to split a longer string into two strings. // TODO(AB): StraightTextLayout used a logic to split a longer string into two strings.
m_shapedGlyphs = textureManager->ShapeSingleTextLine(dp::kBaseFontSizePixels, text, &m_glyphRegions); m_shapedGlyphs = textureManager->ShapeSingleTextLine(dp::kBaseFontSizePixels, stext, &m_glyphRegions);
} }
void PathTextLayout::CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion, void PathTextLayout::CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,