Use font metrics for computing the size of math decorations

It was an error using an absolute size instead of one relative to the
size of the used font. It was requiring using the physical dpi of the
screen and caused #12222. Now everything is computed with respect to
the metrics of the font and should be automatically correct.

Fixes #12222.

diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp
index 7d9bb9433f8ca4b16206e0f00d002039005ed3c7..b818163f0b00d0a1ed7e1d95616d4d1b507718fc 100644 (file)
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -1141,7 +1141,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 
        // needs to be done before reading lyxrc
        QWidget w;
-       lyxrc.dpi = (w.physicalDpiX() + w.physicalDpiY()) / 2;
+       lyxrc.dpi = (w.logicalDpiX() + w.logicalDpiY()) / 2;
 
        guiApp = this;
 

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index ae95cdc1d5473e6acf5943c84db736f6f41a6335..cc4ba162796b8adaf48782f7bc9ec5cb4986749a 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -122,8 +122,8 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
        cell(0).metrics(mi, dim);
 
        int const l1 = mi.base.bv->zoomedPixels(1);
-       int const l2 = 4 * l1;
-       int const l3 = 4 * l1;
+       int const l2 = mathed_char_width(mi.base.font, 'x') - l1;
+       int const l3 = l2;
 
        dh_  = l2; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
        dw_  = l3; //mathed_char_width(LM_TC_VAR, mi, 'x');