anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup a2378c1182: handle the monospace case

Browse Source 
When the font is tt, the stretch space is null. Change the display
rendering to accomodate that.
This commit is contained in:
Jean-Marc Lasgouttes 2023-03-17 14:19:33 +01:00
parent 98b5a16793
commit e2011856bc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/insets/InsetSpecialChar.cpp
View File

@ -209,11 +209,14 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
case END_OF_SENTENCE:
s = from_ascii(".");
break;
case LDOTS:
case LDOTS: {
// see comment in draw().
dim.wid = 3 * fm.width(char_type('.'))
+ 3 * fm.width(char_type(' ')) / 2;
auto const fam = mi.base.font.family();
// Multiplication by 3 is done here to limit rounding effects.
int const spc3 = fam == TYPEWRITER_FAMILY ? 0 : 3 * fm.width(char_type(' ')) / 2;
dim.wid = 3 * fm.width(char_type('.')) + spc3;
break;
}
case MENU_SEPARATOR:
// ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE
// There is a \thinspace on each side of the triangle
@ -291,7 +294,9 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
* that this is usually half a space.
*/
frontend::FontMetrics const & fm = theFontMetrics(font);
int wid1 = fm.width(char_type('.')) + fm.width(char_type(' ')) / 2;
auto const fam = pi.base.font.family();
int const spc = fam == TYPEWRITER_FAMILY ? 0 : fm.width(char_type(' ')) / 2;
int wid1 = fm.width(char_type('.')) + spc;
pi.pain.text(x, y, char_type('.'), font);
pi.pain.text(x + wid1, y, char_type('.'), font);
pi.pain.text(x + 2 * wid1, y, char_type('.'), font);