Merge branch 'master' into docking

This commit is contained in:
ocornut
2025-01-09 17:08:11 +01:00
20 changed files with 1723 additions and 9 deletions

View File

@@ -3802,11 +3802,11 @@ void ImFont::BuildLookupTable()
}
else if (dot_char != 0)
{
const ImFontGlyph* glyph = FindGlyph(dot_char);
const ImFontGlyph* dot_glyph = FindGlyph(dot_char);
EllipsisChar = dot_char;
EllipsisCharCount = 3;
EllipsisCharStep = (glyph->X1 - glyph->X0) + 1.0f;
EllipsisWidth = EllipsisCharStep * 3.0f - 1.0f;
EllipsisCharStep = (float)(int)(dot_glyph->X1 - dot_glyph->X0) + 1.0f;
EllipsisWidth = ImMax(dot_glyph->AdvanceX, dot_glyph->X0 + EllipsisCharStep * 3.0f - 1.0f); // FIXME: Slightly odd for normally mono-space fonts but since this is used for trailing contents.
}
}