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

[drape] Fix gui text alignment

Browse Source 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-08-11 20:48:13 +02:00
committed by Konstantin Pastbin
parent 9aa86fc703
commit 826b56cabc
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libs/drape_frontend/gui/gui_text.cpp
View File

@@ -370,7 +370,10 @@ void MutableLabel::SetText(LabelResult & result, std::string text, ref_ptr<dp::T
// float length = m_shapedText.m_lineWidthInPixels; // float length = m_shapedText.m_lineWidthInPixels;
float maxHeight = 0.0f; float maxHeight = 0.0f;
float length = 0.0f;
std::pair minMaxXPos = {std::numeric_limits<float>::max(), std::numeric_limits<float>::lowest()};
float offsetLeft = 0;
glsl::vec2 pen = glsl::vec2(0.0, 0.0); glsl::vec2 pen = glsl::vec2(0.0, 0.0);
ASSERT_EQUAL(m_glyphRegions.size(), m_shapedText.m_glyphs.size(), ()); ASSERT_EQUAL(m_glyphRegions.size(), m_shapedText.m_glyphs.size(), ());
@@ -384,17 +387,30 @@ void MutableLabel::SetText(LabelResult & result, std::string text, ref_ptr<dp::T
ASSERT_EQUAL(normals.size(), maskTex.size(), ()); ASSERT_EQUAL(normals.size(), maskTex.size(), ());
for (size_t i = 0; i < normals.size(); ++i) for (size_t j = 0; j < normals.size(); ++j)
result.m_buffer.emplace_back(pen + normals[i], maskTex[i]); {
result.m_buffer.emplace_back(pen + normals[j], maskTex[j]);
auto const & back = result.m_buffer.back();
if (back.m_normal.x < minMaxXPos.first)
{
minMaxXPos.first = back.m_normal.x;
offsetLeft = offsets.x;
}
minMaxXPos.second = std::max(minMaxXPos.second, back.m_normal.x);
}
float const advance = metrics.m_xAdvance * m_textRatio;
length += advance + offsets.x;
// TODO(AB): yAdvance is always zero for horizontal layouts. // TODO(AB): yAdvance is always zero for horizontal layouts.
pen += glsl::vec2(advance, metrics.m_yAdvance * m_textRatio); pen += glsl::vec2(metrics.m_xAdvance * m_textRatio, metrics.m_yAdvance * m_textRatio);
maxHeight = std::max(maxHeight, offsets.y + glyph.GetPixelHeight() * m_textRatio); maxHeight = std::max(maxHeight, offsets.y + glyph.GetPixelHeight() * m_textRatio);
} }
glsl::vec2 anchorModifier = glsl::vec2(-length / 2.0f, maxHeight / 2.0f); float const length = minMaxXPos.second - minMaxXPos.first;
// "- offset_left" is an approximation
// A correct version should be
// "- (offset_first_symbol_from_left + offset_last_symbol_from_right) / 2"
// But there is no possibility to determine the offset of the last symbol from the right.
// We only have x_offset which is "offset from left"
glsl::vec2 anchorModifier = glsl::vec2(-length / 2.0f - offsetLeft, maxHeight / 2.0f);
if (m_anchor & dp::Right) if (m_anchor & dp::Right)
anchorModifier.x = -length; anchorModifier.x = -length;
else if (m_anchor & dp::Left) else if (m_anchor & dp::Left)
@@ -421,12 +437,10 @@ MutableLabelHandle::MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::Point
MutableLabelHandle::MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot, MutableLabelHandle::MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot,
ref_ptr<dp::TextureManager> textures) ref_ptr<dp::TextureManager> textures)
: TBase(id, anchor, pivot) : MutableLabelHandle(id, anchor, pivot)
, m_textView(make_unique_dp<MutableLabel>(anchor)) {
, m_isContentDirty(true) m_textureManager = std::move(textures);
, m_textureManager(std::move(textures)) }
, m_glyphsReady(false)
{}
void MutableLabelHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const void MutableLabelHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const
{ {