From 2470320dd6cd84dcff9be6f7647dffb67e57b30e Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Wed, 15 Mar 2006 13:39:59 +0000 Subject: [PATCH] fix symbols fonts on X11 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13378 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/ChangeLog | 5 +++++ src/frontends/qt4/qfont_loader.C | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog index 229cac6d60..a612cc80ae 100644 --- a/src/frontends/qt4/ChangeLog +++ b/src/frontends/qt4/ChangeLog @@ -1,3 +1,8 @@ +2006-03-15 Georg Baum + + * qfont_loader.C (isChosenFont): Xft-enabled Qt 4.1 seems to call + all fonts "Multi". Therefore test for this case. + 2006-03-15 Abdelrazak Younes * QLPopupMenu.[Ch]: renamed topLevelMenu to topLevelMenu_ diff --git a/src/frontends/qt4/qfont_loader.C b/src/frontends/qt4/qfont_loader.C index 8a3ce1cf95..50a600116a 100644 --- a/src/frontends/qt4/qfont_loader.C +++ b/src/frontends/qt4/qfont_loader.C @@ -177,7 +177,8 @@ bool isChosenFont(QFont & font, string const & family) } // Qt 3.2 beta1 returns "xft" for all xft fonts - if (font.rawName() == "xft") { + // Qt 4.1 returns "Multi" for all ? xft fonts + if (font.rawName() == "xft" || font.rawName() == "Multi") { if (contains(fromqstr(fi.family()), family)) { lyxerr[Debug::FONT] << " got it (Xft) "; return true; -- 2.39.2