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

Do not use the return value of Painter::text for logos

Browse Source 
This will allow to get rid of this return value (and avoid computing it).
This commit is contained in:
Jean-Marc Lasgouttes 2016-03-19 17:26:25 +01:00
parent ac759b4368
commit 51b1cfab72
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/insets/InsetSpecialChar.cpp
View File

@ -135,7 +135,16 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
namespace { namespace {
void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) { // helper function: draw text and update x.
void drawChar(PainterInfo & pi, int & x, int const y, char_type ch)
{
pi.pain.text(x, y, ch, pi.base.font);
x += theFontMetrics(pi.base.font).width(ch);
}
void drawLogo(PainterInfo & pi, int & x, int const y, InsetSpecialChar::Kind kind)
{
FontInfo const & font = pi.base.font; FontInfo const & font = pi.base.font;
int const em = theFontMetrics(font).em(); int const em = theFontMetrics(font).em();
switch (kind) { switch (kind) {
@ -143,11 +152,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
/** Reference macro: /** Reference macro:
* \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@}; * \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@};
*/ */
x += pi.pain.text(x, y, from_ascii("L"), font); drawChar(pi, x, y, 'L');
x -= em / 6; x -= em / 6;
x += pi.pain.text(x, y + em / 4, from_ascii("Y"), font); drawChar(pi, x, y + em / 4, 'Y');
x -= em / 8; x -= em / 8;
x += pi.pain.text(x, y, from_ascii("X"), font); drawChar(pi, x, y, 'X');
break; break;
case InsetSpecialChar::PHRASE_TEX: { case InsetSpecialChar::PHRASE_TEX: {
@ -155,11 +164,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
* \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@} * \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
*/ */
int const ex = theFontMetrics(font).ascent('x'); int const ex = theFontMetrics(font).ascent('x');
x += pi.pain.text(x, y, from_ascii("T"), font); drawChar(pi, x, y, 'T');
x -= em / 6; x -= em / 6;
x += pi.pain.text(x, y + ex / 2, from_ascii("E"), font); drawChar(pi, x, y + ex / 2, 'E');
x -= em / 8; x -= em / 8;
x += pi.pain.text(x, y, from_ascii("X"), font); drawChar(pi, x, y, 'X');
break; break;
} }
case InsetSpecialChar::PHRASE_LATEX2E: case InsetSpecialChar::PHRASE_LATEX2E:
@ -168,10 +177,10 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
* \if b\expandafter\@car\f@series\@nil\boldmath\fi * \if b\expandafter\@car\f@series\@nil\boldmath\fi
* \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}} * \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}}
*/ */
drawLogo(pi, InsetSpecialChar::PHRASE_LATEX, x, y); drawLogo(pi, x, y, InsetSpecialChar::PHRASE_LATEX);
x += 3 * em / 20; x += 3 * em / 20;
x += pi.pain.text(x, y, from_ascii("2"), font); drawChar(pi, x, y, '2');
x += pi.pain.text(x, y + em / 4, char_type(0x03b5), font); drawChar(pi, x, y + em / 4, char_type(0x03b5));
break; break;
case InsetSpecialChar::PHRASE_LATEX: { case InsetSpecialChar::PHRASE_LATEX: {
@ -187,13 +196,13 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
* \kern-.15em% * \kern-.15em%
* \TeX} * \TeX}
*/ */
x += pi.pain.text(x, y, from_ascii("L"), font); drawChar(pi, x, y, 'L');
x -= 9 * em / 25; x -= 9 * em / 25;
FontInfo smaller = font; PainterInfo pi2 = pi;
smaller.decSize().decSize(); pi2.base.font.decSize().decSize();
x += pi.pain.text(x, y - em / 5, from_ascii("A"), smaller); drawChar(pi2, x, y - em / 5, 'A');
x -= 3 * em / 20; x -= 3 * em / 20;
drawLogo(pi, InsetSpecialChar::PHRASE_TEX, x, y); drawLogo(pi, x, y, InsetSpecialChar::PHRASE_TEX);
break; break;
} }
default: default:
@ -269,7 +278,7 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
case PHRASE_TEX: case PHRASE_TEX:
case PHRASE_LATEX2E: case PHRASE_LATEX2E:
case PHRASE_LATEX: case PHRASE_LATEX:
drawLogo(pi, kind_, x, y); drawLogo(pi, x, y, kind_);
break; break;
} }
} }