anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup: fix comments, move declarations around

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2021-06-09 15:49:01 +02:00
parent e309a5599e
commit ca2706e30e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/frontends/FontMetrics.h
View File

@ -80,20 +80,30 @@ public:
/// return slope for italic font
virtual double italicSlope() const = 0;
/// return the width of the char in the font
virtual int width(char_type c) const = 0;
/// return the ascent of the char in the font
virtual int ascent(char_type c) const = 0;
/// return the descent of the char in the font
virtual int descent(char_type c) const = 0;
/// return the maximum height of the font
inline int maxHeight() const { return maxAscent() + maxDescent(); }
/// return the height of the char in the font
inline int height(char_type c) const { return ascent(c) + descent(c); }
/// return the left bearing of the char in the font
virtual int lbearing(char_type c) const = 0;
/// return the right bearing of the char in the font
virtual int rbearing(char_type c) const = 0;
/// return the width of the char in the font
virtual int width(char_type c) const = 0;
/// return the width of the string in the font
virtual int width(docstring const & s) const = 0;
/// FIXME ??
virtual int signedWidth(docstring const & s) const = 0;
/// return the inner width of the char in the font
inline int center(char_type c) const {
return (rbearing(c) - lbearing(c)) / 2;
}
/**
* return the x offset of a position in the string. The
* direction of the string is forced, and the returned value
@ -139,17 +149,6 @@ public:
int & ascent,
int & descent) const = 0;
/// return the maximum descent of the font
inline int maxHeight() const { return maxAscent() + maxDescent(); }
/// return the descent of the char in the font
inline int height(char_type c) const { return ascent(c) + descent(c); }
/// return the inner width of the char in the font
inline int center(char_type c) const {
return (rbearing(c) - lbearing(c)) / 2;
}
/// return the number of expanding characters taken into account for
/// increased inter-word spacing during justification
virtual int countExpanders(docstring const & str) const = 0;

1
src/frontends/qt/GuiFontMetrics.cpp
View File

@ -153,6 +153,7 @@ int GuiFontMetrics::maxDescent() const
{
// We add 1 as the value returned by QT is different than X
// See http://doc.trolltech.com/2.3/qfontmetrics.html#200b74
// FIXME: check this
return metrics_.descent() + 1;
}