a bit nice underlines

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@657 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 828cf7115e2b6d04a5a909a4c4dce61c75548df7..49851cc60081da52f3b8bbba024d233ea77704bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-04-14  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+       * src/Painter.C (underline): draw a slimer underline in most cases.
+
        * src/lyx_main.C (error_handler): use extern "C"
 
 2000-04-12  Lars Gullik Bjønnes  <larsbj@lyx.org>

diff --git a/src/Painter.C b/src/Painter.C
index fa8db6ea0cf962268cf0215a77d9c92d27f36d14..8d44c84fb244872c03f71c0eb96e569081b6e8a3 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -324,8 +324,12 @@ void Painter::underline(LyXFont const & f, int x, int y, int width)
        // What about underbars?
        if (f.underbar() == LyXFont::ON && f.latex() != LyXFont::ON) {
                int below = max(lyxfont::maxDescent(f) / 2, 2);
-               int height = max((lyxfont::maxDescent(f) / 4) - 1, 0);
-               fillRectangle(x, y + below, width, below + height, f.color());
+               int height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
+               if (height < 2)
+                       line(x, y + below, x + width, y + below, f.color());
+               else
+                       fillRectangle(x, y + below, width, below + height,
+                                     f.color());
        }
 }