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

Fix defaultFont problems (bug 2308)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13266 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-02-22 15:44:57 +00:00
parent 2535ea14bd
commit 3490f23a1d
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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

4
src/insets/ChangeLog
View File

@ -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)

6
src/insets/insetfootlike.C
View File

@ -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;
}

1
src/rowpainter.C
View File

@ -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_;