#10571 improved handling of WM's signal when switching from or to full-screen window

[features.git] / src / frontends / qt / GuiFontLoader.cpp

diff --git a/src/frontends/qt/GuiFontLoader.cpp b/src/frontends/qt/GuiFontLoader.cpp
index c6c0ecbcd34ed3439bfb675bf3ec3efc47113ece..6f1de04652d08315a41fe8061480723c897bbb4a 100644 (file)
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -36,8 +36,8 @@ using namespace std;
 using namespace lyx::support;
 
 QString const math_fonts[] = {"cmex10", "cmmi10", "cmr10", "cmsy10",
-       "esint10", "eufm10", "msam10", "msbm10", "rsfs10", "stmary10",
-       "wasy10"};
+       "dsrom10", "esint10", "eufm10", "msam10", "msbm10", "rsfs10",
+       "stmary10", "wasy10"};
 int const num_math_fonts = sizeof(math_fonts) / sizeof(*math_fonts);
 
 namespace lyx {
@@ -64,10 +64,13 @@ namespace {
 struct SymbolFont {
        FontFamily lyx_family;
        QString family;
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
        QString xlfd;
+#endif
 };
 
 SymbolFont symbol_fonts[] = {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
        { SYMBOL_FAMILY,"symbol", "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific"},
        { CMR_FAMILY,   "cmr10",  "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { CMSY_FAMILY,  "cmsy10", "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*" },
@@ -75,11 +78,27 @@ SymbolFont symbol_fonts[] = {
        { CMEX_FAMILY,  "cmex10", "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*" },
        { MSA_FAMILY,   "msam10", "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*" },
        { MSB_FAMILY,   "msbm10", "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*" },
+       { DS_FAMILY,    "dsrom10", "-*-dsrom10-*-*-*-*-*-*-*-*-*-*-*-*" },
        { EUFRAK_FAMILY,"eufm10", "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { RSFS_FAMILY,  "rsfs10", "-*-rsfs10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { STMARY_FAMILY,"stmary10","-*-stmary10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { WASY_FAMILY,  "wasy10", "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*" },
        { ESINT_FAMILY, "esint10","-*-esint10-medium-*-*-*-*-*-*-*-*-*-*-*" }
+#else
+       { SYMBOL_FAMILY,"symbol"},
+       { CMR_FAMILY,   "cmr10"},
+       { CMSY_FAMILY,  "cmsy10"},
+       { CMM_FAMILY,   "cmmi10"},
+       { CMEX_FAMILY,  "cmex10"},
+       { MSA_FAMILY,   "msam10"},
+       { MSB_FAMILY,   "msbm10"},
+       { DS_FAMILY,    "dsrom10"},
+       { EUFRAK_FAMILY,"eufm10"},
+       { RSFS_FAMILY,  "rsfs10"},
+       { STMARY_FAMILY,"stmary10"},
+       { WASY_FAMILY,  "wasy10"},
+       { ESINT_FAMILY, "esint10"}
+#endif
 };
 
 size_t const nr_symbol_fonts = sizeof(symbol_fonts) / sizeof(symbol_fonts[0]);
@@ -126,6 +145,19 @@ GuiFontInfo & fontinfo(FontInfo const & f)
 }
 
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+QString rawName(QString const & family)
+{
+       for (size_t i = 0; i < nr_symbol_fonts; ++i)
+               if (family == symbol_fonts[i].family)
+                       return symbol_fonts[i].xlfd;
+
+       LYXERR(Debug::FONT, "BUG: family not found !");
+       return QString();
+}
+#endif
+
+
 QString symbolFamily(FontFamily family)
 {
        for (size_t i = 0; i < nr_symbol_fonts; ++i) {
@@ -204,14 +236,19 @@ QFont symbolFont(QString const & family, bool * ok)
                return font;
        }
 
-       LYXERR(Debug::FONT, "Trying " << family << " ... ");
-       font.setFamily(family);
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+       // A simple setFamily() fails on Qt 2
+
+       QString const raw = rawName(family);
+       LYXERR(Debug::FONT, "Trying " << raw << " ... ");
+       font.setRawName(raw);
 
        if (isChosenFont(font, family, QString())) {
                LYXERR(Debug::FONT, "raw version!");
                *ok = true;
                return font;
        }
+#endif
 
        LYXERR(Debug::FONT, " FAILED :-(");
        *ok = false;
@@ -345,6 +382,10 @@ QFont makeQFont(FontInfo const & f)
        else
                LYXERR(Debug::FONT, "This font is NOT an exact match");
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+       LYXERR(Debug::FONT, "XFLD: " << font.rawName());
+#endif
+
        font.setPointSizeF(f.realSize() * lyxrc.currentZoom / 100.0);
 
        LYXERR(Debug::FONT, "The font has size: " << font.pointSizeF());