fix crash due to invalidated iterator

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

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 6787f32a1d3fedd2ffff361fd54910abfb16d698..6650722fcacb2ff2557c9a87d7ff5a4d19cb9f33 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -1,121 +1,102 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file Painter.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author unknown
+ * \author John Levon
  *
- *         Copyright 1998-2001 The LyX Team
- *
- *======================================================*/
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Painter.h"
-#include "lyxfont.h"
-#include "WorkArea.h"
 #include "font_metrics.h"
+#include "WorkArea.h"
 
+#include "LColor.h"
+#include "lyxfont.h"
 
-int PainterBase::paperMargin() const
-{
-       return 20;
-}
-
-
-int PainterBase::paperWidth() const
-{
-       return owner.workWidth();
-}
-
-
-int PainterBase::paperHeight() const
-{
-       return owner.height();
-}
-
-
-PainterBase & PainterBase::circle(int x, int y, unsigned int d,
-                                 LColor::color col)
-{
-       return ellipse(x, y, d, d, col);
-}
-
-
-PainterBase & PainterBase::ellipse(int x, int y,
-                                  unsigned int w, unsigned int h,
-                                  LColor::color col)
-{
-       return arc(x, y, w, h, 0, 0, col);
-}
+using std::max;
+using std::string;
 
 
-PainterBase & PainterBase::button(int x, int y, int w, int h)
+void Painter::button(int x, int y, int w, int h)
 {
        fillRectangle(x, y, w, h, LColor::buttonbg);
        buttonFrame(x, y, w, h);
-       return * this;
 }
 
 
-PainterBase & PainterBase::buttonFrame(int x, int y, int w, int h)
+void Painter::buttonFrame(int x, int y, int w, int h)
 {
        //  Width of a side of the button
-       int d = 2;
+       int const d = 2;
 
        fillRectangle(x, y, w, d, LColor::top);
-       fillRectangle(x, (y+h-d), w, d, LColor::bottom);
+       fillRectangle(x, (y + h - d), w, d, LColor::bottom);
 
        // Now a couple of trapezoids
        int x1[4], y1[4];
 
        x1[0] = x + d;   y1[0] = y + d;
-       x1[1] = x + d;   y1[1] = (y + h - d);
-       x1[2] = x;     y1[2] = y + h;
-       x1[3] = x;     y1[3] = y;
+       x1[1] = x + d;   y1[1] = y + h - d;
+       x1[2] = x;       y1[2] = y + h;
+       x1[3] = x;       y1[3] = y;
        fillPolygon(x1, y1, 4, LColor::left);
 
-       x1[0] = (x + w - d); y1[0] = y + d;
-       x1[1] = (x + w - d); y1[1] = (y + h - d);
-       x1[2] = x + w; y1[2] = (y + h - d);
-       x1[3] = x + w; y1[3] = y;
+       x1[0] = x + w - d;  y1[0] = y + d;
+       x1[1] = x + w - d;  y1[1] = y + h - d;
+       x1[2] = x + w;      y1[2] = y + h - d;
+       x1[3] = x + w;      y1[3] = y;
        fillPolygon(x1, y1, 4, LColor::right);
-
-       return *this;
 }
 
 
-PainterBase & PainterBase::rectText(int x, int baseline,
-                                   string const & str,
-                                   LyXFont const & font,
-                                   LColor::color back,
-                                   LColor::color frame)
+void Painter::rectText(int x, int y,
+       string const & str,
+       LyXFont const & font,
+       LColor_color back,
+       LColor_color frame)
 {
        int width;
        int ascent;
        int descent;
 
        font_metrics::rectText(str, font, width, ascent, descent);
-       rectangle(x, baseline - ascent, width, ascent + descent, frame);
-       fillRectangle(x + 1, baseline - ascent + 1, width - 1,
-                     ascent + descent - 1, back);
-       text(x + 3, baseline, str, font);
-       return *this;
+
+       if (back != LColor::none)
+               fillRectangle(x + 1, y - ascent + 1, width - 1,
+                             ascent + descent - 1, back);
+
+       if (frame != LColor::none)
+               rectangle(x, y - ascent, width, ascent + descent, frame);
+
+       text(x + 3, y, str, font);
 }
 
 
-PainterBase & PainterBase::buttonText(int x, int baseline,
-                                     string const & str,
-                                     LyXFont const & font)
+void Painter::buttonText(int x, int y, string const & str, LyXFont const & font)
 {
        int width;
        int ascent;
        int descent;
 
        font_metrics::buttonText(str, font, width, ascent, descent);
-       button(x, baseline - ascent, width, descent + ascent);
-       text(x + 4, baseline, str, font);
-       return *this;
+
+       button(x, y - ascent, width, descent + ascent);
+       text(x + 4, y, str, font);
+}
+
+
+void Painter::underline(LyXFont const & f, int x, int y, int width)
+{
+       int const below = max(font_metrics::maxDescent(f) / 2, 2);
+       int const height = max((font_metrics::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());
 }