Fix metrics of math characters with 0 width

It seems that QTextLayout does not handle properly a single character
with 0 width. This breaks drawing of things like \not.

No status line needed as this amends 24648404.

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index f17ac370817be5d365442568bba9edad5581a7a2..5bb99aafc1b4c65d3295e6fba710130d7419cd6a 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -178,16 +178,28 @@ int GuiFontMetrics::width(docstring const & s) const
        int * pw = strwidth_cache_[s];
        if (pw)
                return *pw;
-       // For some reason QMetrics::width returns a wrong value with Qt5
-       // int w = metrics_.width(toqstr(s));
 #endif
-       QTextLayout tl;
-       tl.setText(toqstr(s));
-       tl.setFont(font_);
-       tl.beginLayout();
-       QTextLine line = tl.createLine();
-       tl.endLayout();
-       int w = int(line.naturalTextWidth());
+       /* For some reason QMetrics::width returns a wrong value with Qt5
+        * with some arabic text. OTOH, QTextLayout is broken for single
+        * characters with null width (like \not in mathed). Also, as a
+        * safety measure, always use QMetrics::width with our math fonts.
+       */
+       int w = 0;
+       if (s.length() == 1
+#if QT_VERSION >= 0x040800
+           || font_.styleName() == "LyX"
+#endif
+           )
+               w = metrics_.width(toqstr(s));
+       else {
+               QTextLayout tl;
+               tl.setText(toqstr(s));
+               tl.setFont(font_);
+               tl.beginLayout();
+               QTextLine line = tl.createLine();
+               tl.endLayout();
+               w = int(line.naturalTextWidth());
+       }
 #ifdef CACHE_METRICS_WIDTH
        strwidth_cache_.insert(s, new int(w), s.size() * sizeof(char_type));
 #endif