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

[features.git] / src / dimension.C

diff --git a/src/dimension.C b/src/dimension.C
index c1bb59540527e378815ebf3e93aba645a809ab8d..1edb794ebcc22f73f13130bb854a987a9beb8a05 100644 (file)
--- a/src/dimension.C
+++ b/src/dimension.C
@@ -11,7 +11,9 @@
 #include <config.h>
 
 #include "dimension.h"
-#include "frontends/font_metrics.h"
+#include "frontends/Application.h"
+#include "frontends/FontLoader.h"
+#include "frontends/FontMetrics.h"
 
 
 void Dimension::operator+=(Dimension const & dim)
@@ -26,7 +28,8 @@ void Dimension::operator+=(Dimension const & dim)
 
 void Dimension::clear(LyXFont const & font)
 {
-       asc = font_metrics::maxAscent(font);
-       des = font_metrics::maxDescent(font);
+       lyx::frontend::FontMetrics const & fm = theApp->fontLoader().metrics(font);
+       asc = fm.maxAscent();
+       des = fm.maxDescent();
        wid = 0;
 }