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

get getDrawFont working again

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8261 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2003-12-16 18:49:04 +00:00
parent 9017670276
commit 17b31b1764
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/ChangeLog
View File

@ -1,4 +1,8 @@
2003-12-16 Martin Vermeer <martin.vermeer@hut.fi>
* insetcharstyle.C: get getDrawFont working again
2003-12-15 André Pönitz <poenitz@gmx.net>
* insettabular.[Ch]:

6
src/insets/insetcharstyle.C
View File

@ -93,7 +93,10 @@ void InsetCharStyle::read(Buffer const & buf, LyXLex & lex)
void InsetCharStyle::metrics(MetricsInfo & mi, Dimension & dim) const
{
LyXFont tmpfont = mi.base.font;
getDrawFont(mi.base.font);
InsetCollapsable::metrics(mi, dim);
mi.base.font = tmpfont;
dim_ = dim;
if (has_label_)
dim_.des += ascent();
@ -106,8 +109,11 @@ void InsetCharStyle::draw(PainterInfo & pi, int x, int y) const
yo_ = y;
// FIXME: setStatus(Inlined); this is not a const operation
LyXFont tmpfont = pi.base.font;
inset.setDrawFrame(InsetText::NEVER);
getDrawFont(pi.base.font);
inset.draw(pi, x, y);
pi.base.font = tmpfont;
pi.pain.line(x + 2, y + inset.descent() - 4, x + 2,
y + inset.descent(), params_.labelfont.color());