get getDrawFont working again

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8261 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 679793f0d59c1b22bdac2f5875da514226e8676a..dddd5f004fc2b2fa0fcc957e11ebab6533232f71 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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]:

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 8de473e8e5eb002635f610d62f602b1eb71bdfbe..dd7c66f7831a6f471a2d5db3f8382d3275186169 100644 (file)
--- 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());