From 17b31b17646011bcba240046e7849cb5c58b086e Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Tue, 16 Dec 2003 18:49:04 +0000 Subject: [PATCH] get getDrawFont working again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8261 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetcharstyle.C | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 679793f0d5..dddd5f004f 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,4 +1,8 @@ +2003-12-16 Martin Vermeer + + * insetcharstyle.C: get getDrawFont working again + 2003-12-15 André Pönitz * insettabular.[Ch]: diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C index 8de473e8e5..dd7c66f783 100644 --- a/src/insets/insetcharstyle.C +++ b/src/insets/insetcharstyle.C @@ -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()); -- 2.39.2