This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for...

[features.git] / src / insets / insetvspace.C

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index 8a80dd3853506124e7e8f473acffb08533be489b..7a42d5024dc2ad30e211198b38e9ef0cb31b7def 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -23,7 +23,9 @@
 #include "lyxtext.h"
 #include "metricsinfo.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/Application.h"
+#include "frontends/FontLoader.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include <sstream>
@@ -131,7 +133,7 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
        int d = 0;
        string lab = label();
        docstring dlab(lab.begin(), lab.end());
-       font_metrics::rectText(dlab, font, w, a, d);
+       theApp->fontLoader().metrics(font).rectText(dlab, w, a, d);
 
        height = max(height, a + d);
 
@@ -183,7 +185,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
        font.decSize();
        string lab = label();
        docstring dlab(lab.begin(), lab.end());
-       font_metrics::rectText(dlab, font, w, a, d);
+       theApp->fontLoader().metrics(font).rectText(dlab, w, a, d);
 
        pi.pain.rectText(x + 2 * arrow_size + 5,
                         start + (end - start) / 2 + (a - d) / 2,