anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make FontInfo & fontinfo(LyXFont const & f) inline

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10249 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2005-07-16 16:13:08 +00:00
parent 7e08de938a
commit a5b556bdd6
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/frontends/qt2/qfont_loader.C
View File

@ -342,25 +342,13 @@ int FontInfo::width(Uchar val) const
}
FontInfo & FontLoader::fontinfo(LyXFont const & f)
{
FontInfo * fi = fontinfo_[f.family()][f.series()][f.realShape()][f.size()];
if (fi)
return *fi;
FontInfo * fi2 = new FontInfo(f);
fontinfo_[f.family()][f.series()][f.realShape()][f.size()] = fi2;
return *fi2;
}
bool FontLoader::available(LyXFont const & f)
{
if (!lyx_gui::use_gui)
return false;
static vector<bool> cache_set(LyXFont::NUM_FAMILIES, false);
static vector<bool> cache(LyXFont::NUM_FAMILIES, false);
static vector<int> cache_set(LyXFont::NUM_FAMILIES, false);
static vector<int> cache(LyXFont::NUM_FAMILIES, false);
LyXFont::FONT_FAMILY family = f.family();
if (cache_set[family])
@ -368,16 +356,14 @@ bool FontLoader::available(LyXFont const & f)
cache_set[family] = true;
string const pat = symbolFamily(family);
if (!pat.empty()) {
pair<QFont, bool> tmp = getSymbolFont(pat);
if (tmp.second) {
cache[family] = true;
return true;
}
if (pat.empty())
// We don't care about non-symbol fonts
return false;
}
// We don't care about non-symbol fonts
return false;
pair<QFont, bool> tmp = getSymbolFont(pat);
if (!tmp.second)
return false;
cache[family] = true;
return true;
}

8
src/frontends/qt2/qfont_loader.h
View File

@ -79,7 +79,13 @@ public:
static void addToFontPath();
/// get font info (font + metrics) for the given LyX font. Does not fail.
FontInfo & fontinfo(LyXFont const & f);
FontInfo & fontinfo(LyXFont const & f) {
FontInfo * & fi =
fontinfo_[f.family()][f.series()][f.realShape()][f.size()];
if (!fi)
fi = new FontInfo(f);
return *fi;
}
private:
/// BUTT ugly !