pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[core] for gui elements split text even it's bidi text

Browse source
This commit is contained in:
ExMix 2014-08-07 14:53:06 +03:00 • committed by Alex Zolotarev
parent a8bc35a29f
commit 39479def8e
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/straight_text_element.cpp
View file

@ -84,7 +84,7 @@ namespace graphics
if (!visText().empty())
{
buffer_vector<strings::UniString, 3> res;
if (p.m_doSplit && !isBidi())
if (p.m_doForceSplit || (p.m_doSplit && !isBidi()))
{
res.clear();
if (!p.m_delimiters.empty())
@ -173,6 +173,7 @@ namespace graphics
m_maxSymInRow(20),
m_maxPixelWidth(numeric_limits<unsigned>::max()),
m_doSplit(false),
m_doForceSplit(false),
m_useAllParts(true),
m_offset(0, 0)
{}

1
graphics/straight_text_element.hpp
View file

@ -22,6 +22,7 @@ namespace graphics
unsigned m_maxSymInRow;
unsigned m_maxPixelWidth;
bool m_doSplit;
bool m_doForceSplit;
bool m_useAllParts;
m2::PointD m_offset;
string m_delimiters;

1
gui/text_view.cpp
View file

@ -48,6 +48,7 @@ namespace gui
params.m_glyphCache = m_controller->GetGlyphCache();
params.m_logText = strings::MakeUniString(m_text);
params.m_doSplit = true;
params.m_doForceSplit = true;
params.m_delimiters = "\n";
params.m_useAllParts = true;
params.m_maxPixelWidth = m_maxWidth;