Fix bug 3101 and 3108

[lyx.git] / src / frontends / Painter.C

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 8d14ae3cf0c62a66da66c2c040fe58e35b43324b..e893aafdbb5bf0c6004ef3cf692e147fb1d25140 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -13,8 +13,6 @@
 
 #include "frontends/Painter.h"
 
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 
 #include "LColor.h"
@@ -28,27 +26,22 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-void Painter::button(int x, int y, int w, int h)
+void Painter::button(int x, int y, int w, int h, bool mouseHover)
 {
-       fillRectangle(x, y, w, h, LColor::buttonbg);
+       if (mouseHover)
+               fillRectangle(x, y, w, h, LColor::buttonhoverbg);
+       else
+               fillRectangle(x, y, w, h, LColor::buttonbg);
        buttonFrame(x, y, w, h);
 }
 
 
 void Painter::buttonFrame(int x, int y, int w, int h)
 {
-       //  Width of a side of the button
-       int const d = 2;
-
-       fillRectangle(x, y, w, d, LColor::top);
-       fillRectangle(x, y + h - d, w, d, LColor::bottom);
-
-       for (int i = 0 ; i < d ; ++i) {
-               line(x + i, y + i,
-                    x + i, y + h - 1 - i, LColor::left);
-               line(x + w - 1 - i, y + i + 1,
-                    x + w - 1 - i, y + h - 1 - i, LColor::right);
-       }
+       line(x, y, x, y + h - 1, LColor::buttonframe);
+       line(x - 1 + w, y, x - 1 + w, y + h - 1, LColor::buttonframe);
+       line(x, y - 1, x - 1 + w, y - 1, LColor::buttonframe);
+       line(x, y + h - 1, x - 1 + w, y + h - 1, LColor::buttonframe);
 }
 
 
@@ -62,7 +55,7 @@ void Painter::rectText(int x, int y,
        int ascent;
        int descent;
 
-       FontMetrics const & fm = theApp->fontLoader().metrics(font);
+       FontMetrics const & fm = theFontMetrics(font);
        fm.rectText(str, width, ascent, descent);
 
        if (back != LColor::none)
@@ -76,23 +69,24 @@ void Painter::rectText(int x, int y,
 }
 
 
-void Painter::buttonText(int x, int y, docstring const & str, LyXFont const & font)
+void Painter::buttonText(int x, int y, docstring const & str, 
+       LyXFont const & font, bool mouseHover)
 {
        int width;
        int ascent;
        int descent;
 
-       FontMetrics const & fm = theApp->fontLoader().metrics(font);
+       FontMetrics const & fm = theFontMetrics(font);
        fm.buttonText(str, width, ascent, descent);
 
-       button(x, y - ascent, width, descent + ascent);
-       text(x + 4, y, str, font);
+       button(x, y - ascent, width, descent + ascent, mouseHover);
+       text(x + 3, y - 1, str, font);
 }
 
 
 void Painter::underline(LyXFont const & f, int x, int y, int width)
 {
-       FontMetrics const & fm = theApp->fontLoader().metrics(f);
+       FontMetrics const & fm = theFontMetrics(f);
 
        int const below = max(fm.maxDescent() / 2, 2);
        int const height = max((fm.maxDescent() / 4) - 1, 1);