Fix defaultFont problems (bug 2308)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d4b32b3e54716cd3ddfea5a7628eeb4404b0e1d..4f0f649919a0c345ef463479b8c31eeafb743587 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-22  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * rowpainter.C (paintFromPos): ditch applyOuterFont (bug 2308).
+
 2006-02-06  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * text2.C (deleteEmptyParagraphMechanism): 64bit compile fix

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 89d6064c6495f59a4edf358502afa270ac1438c2..8a037287a785d21536cf01d0a0c302eb213667c0 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-22  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * insetfootlike.C (metrics, draw): use buffer's default font (bug 2308).
+
 2006-02-05  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * insettext.C: Fix bug 2115: blue language lines (for default font)

diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C
index 6e33522aedb1b157b66584ec6ebf707dcf0491a8..154c29cdb643c0eeee0e7d88d78ec5ebd4a985f0 100644 (file)
--- a/src/insets/insetfootlike.C
+++ b/src/insets/insetfootlike.C
@@ -13,6 +13,8 @@
 #include "insetfootlike.h"
 
 #include "buffer.h"
+#include "BufferView.h"
+#include "bufferparams.h"
 #include "LColor.h"
 #include "metricsinfo.h"
 #include "paragraph.h"
@@ -45,7 +47,7 @@ InsetFootlike::InsetFootlike(InsetFootlike const & in)
 void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        LyXFont tmpfont = mi.base.font;
-       mi.base.font = LyXFont(LyXFont::ALL_SANE);
+       mi.base.font = mi.base.bv->buffer()->params().getFont();
        InsetCollapsable::metrics(mi, dim);
        mi.base.font = tmpfont;
        dim_ = dim;
@@ -55,7 +57,7 @@ void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
        LyXFont tmpfont = pi.base.font;
-       pi.base.font = LyXFont(LyXFont::ALL_SANE);
+       pi.base.font = pi.base.bv->buffer()->params().getFont();
        InsetCollapsable::draw(pi, x, y);
        pi.base.font = tmpfont;
 }

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 8d56f11cdf5a2ed2e34707261b22c2775d7c8ceb..2b8193f5ea9d8c38cbb7271a59563e4d8d48a383 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -306,7 +306,6 @@ void RowPainter::paintFromPos(pos_type & vpos)
 {
        pos_type const pos = text_.bidi.vis2log(vpos);
        LyXFont orig_font = text_.getFont(par_, pos);
-       text_.applyOuterFont(orig_font);
 
        double const orig_x = x_;