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

cache and use the textclass default font in each LyXText

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7409 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-07-28 10:41:47 +00:00
parent c198343f93
commit ac74abc03c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lyxtext.h
View File

@ -61,7 +61,7 @@ public:
/// the current font /// the current font
LyXFont real_current_font; LyXFont real_current_font;
/// our buffer's default layout font /// our buffer's default layout font
//LyXFont defaultfont_; LyXFont defaultfont_;
private: private:
/** the 'anchor' row: the position of this row remains constant /** the 'anchor' row: the position of this row remains constant
* with respect to the top of the screen * with respect to the top of the screen

8
src/text2.C
View File

@ -156,7 +156,7 @@ LyXFont LyXText::getFont(ParagraphList::iterator pit, pos_type pos) const
// Realize with the fonts of lesser depth. // Realize with the fonts of lesser depth.
tmpfont.realize(outerFont(pit, ownerParagraphs())); tmpfont.realize(outerFont(pit, ownerParagraphs()));
//tmpfont.realize(defaultfont_); tmpfont.realize(defaultfont_);
return tmpfont; return tmpfont;
} }
@ -173,7 +173,7 @@ LyXFont LyXText::getLayoutFont(ParagraphList::iterator pit) const
LyXFont font = layout->font; LyXFont font = layout->font;
// Realize with the fonts of lesser depth. // Realize with the fonts of lesser depth.
font.realize(outerFont(pit, ownerParagraphs())); font.realize(outerFont(pit, ownerParagraphs()));
//font.realize(defaultfont_); font.realize(defaultfont_);
return font; return font;
} }
@ -190,7 +190,7 @@ LyXFont LyXText::getLabelFont(ParagraphList::iterator pit) const
LyXFont font = layout->labelfont; LyXFont font = layout->labelfont;
// Realize with the fonts of lesser depth. // Realize with the fonts of lesser depth.
font.realize(outerFont(pit, ownerParagraphs())); font.realize(outerFont(pit, ownerParagraphs()));
//font.realize(defaultfont_); font.realize(defaultfont_);
return font; return font;
} }
@ -243,7 +243,7 @@ void LyXText::setCharFont(
} }
} }
//layoutfont.realize(defaultfont_); layoutfont.realize(defaultfont_);
// Now, reduce font against full layout font // Now, reduce font against full layout font
font.reduce(layoutfont); font.reduce(layoutfont);