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

Hopefully fix monolithic build.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23380 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-03-02 10:20:13 +00:00
parent 6bf2052227
commit bced544674
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiFontMetrics.cpp
View File

@ -177,11 +177,11 @@ int GuiFontMetrics::signedWidth(docstring const & s) const
} }
static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
void GuiFontMetrics::rectText(docstring const & str, void GuiFontMetrics::rectText(docstring const & str,
int & w, int & ascent, int & descent) const int & w, int & ascent, int & descent) const
{ {
static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
w = width(str) + Inset::TEXT_TO_INSET_OFFSET; w = width(str) + Inset::TEXT_TO_INSET_OFFSET;
ascent = metrics_.ascent() + d; ascent = metrics_.ascent() + d;
descent = metrics_.descent() + d; descent = metrics_.descent() + d;

3
src/frontends/qt4/GuiPainter.cpp
View File

@ -430,7 +430,6 @@ void GuiPainter::buttonFrame(int x, int y, int w, int h)
line(x, y + h - 1, x - 1 + w, y + h - 1, Color_buttonframe); line(x, y + h - 1, x - 1 + w, y + h - 1, Color_buttonframe);
} }
static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
void GuiPainter::rectText(int x, int y, docstring const & str, void GuiPainter::rectText(int x, int y, docstring const & str,
FontInfo const & font, ColorCode back, ColorCode frame) FontInfo const & font, ColorCode back, ColorCode frame)
@ -463,6 +462,8 @@ void GuiPainter::buttonText(int x, int y, docstring const & str,
FontMetrics const & fm = theFontMetrics(font); FontMetrics const & fm = theFontMetrics(font);
fm.buttonText(str, width, ascent, descent); fm.buttonText(str, width, ascent, descent);
static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
button(x + d, y - ascent, width - d, descent + ascent, mouseHover); button(x + d, y - ascent, width - d, descent + ascent, mouseHover);
text(x + Inset::TEXT_TO_INSET_OFFSET, y, str, font); text(x + Inset::TEXT_TO_INSET_OFFSET, y, str, font);
} }