do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.cpp

diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index b6eb96927817a28cb7630627d38cf2600de53e5d..01c8ce7738df4fe2c63dad5ae2ce2993e20aaf2d 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -18,11 +18,11 @@
 #include "Language.h"
 #include "Dimension.h"
 
-#include "support/unicode.h"
+#include "insets/Inset.h"
 
 #include <boost/assert.hpp>
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
@@ -180,8 +180,9 @@ int GuiFontMetrics::signedWidth(docstring const & s) const
 void GuiFontMetrics::rectText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
-       static int const d = 2;
-       w = width(str) + d * 2 + 2;
+       static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+
+       w = width(str) + Inset::TEXT_TO_INSET_OFFSET;
        ascent = metrics_.ascent() + d;
        descent = metrics_.descent() + d;
 }
@@ -191,10 +192,8 @@ void GuiFontMetrics::rectText(docstring const & str,
 void GuiFontMetrics::buttonText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
-       static int const d = 3;
-       w = width(str) + d * 2 + 2;
-       ascent = metrics_.ascent() + d;
-       descent = metrics_.descent() + d;
+       rectText(str, w, ascent, descent);
+       w += Inset::TEXT_TO_INSET_OFFSET;
 }