do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index f104abc58438ea1ec2cc29bdb1a35247793f2849..275c8d3eeac774334b6a67f1008acd4ee595cff2 100644 (file)
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -16,14 +16,13 @@
 #include "GuiApplication.h"
 #include "GuiFontMetrics.h"
 #include "GuiImage.h"
-
-#include "GuiApplication.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
 #include "Language.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
+
 #include <QPixmapCache>
 #include <QTextLayout>
 
@@ -365,8 +364,6 @@ int GuiPainter::text(int x, int y, docstring const & s,
                        setFont(fi.font);
                // We need to draw the text as LTR as we use our own bidi code.
                setLayoutDirection(Qt::LeftToRight);
-               // We need to draw the text as LTR as we use our own bidi code.
-               setLayoutDirection(Qt::LeftToRight);
                drawText(x, y, str);
                //LYXERR(Debug::PAINTING, "draw " << string(str.toUtf8())
                //      << " at " << x << "," << y);
@@ -465,8 +462,10 @@ void GuiPainter::buttonText(int x, int y, docstring const & str,
        FontMetrics const & fm = theFontMetrics(font);
        fm.buttonText(str, width, ascent, descent);
 
-       button(x + 1, y - ascent, width - 2, descent + ascent, mouseHover);
-       text(x + 4, y - 1, str, font);
+       static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+
+       button(x + d, y - ascent, width - d, descent + ascent, mouseHover);
+       text(x + Inset::TEXT_TO_INSET_OFFSET, y, str, font);
 }