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 d71c0b034bfb40049f5c10dc095aabf4656863de..01c8ce7738df4fe2c63dad5ae2ce2993e20aaf2d 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -177,11 +177,11 @@ int GuiFontMetrics::signedWidth(docstring const & s) const
 }
 
 
-static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
-
 void GuiFontMetrics::rectText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
+       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;
@@ -192,9 +192,8 @@ void GuiFontMetrics::rectText(docstring const & str,
 void GuiFontMetrics::buttonText(docstring const & str,
        int & w, int & ascent, int & descent) const
 {
-       w = width(str) + 2 * Inset::TEXT_TO_INSET_OFFSET;
-       ascent = metrics_.ascent() + d;
-       descent = metrics_.descent() + d;
+       rectText(str, w, ascent, descent);
+       w += Inset::TEXT_TO_INSET_OFFSET;
 }