X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiPainter.cpp;h=afa2182eb671f4ee3e53208c0df13efc4a273e86;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=bda52f189049d209e71c050e24665e8db94da29a;hpb=d51c31ca8573caf4071833ba67d4d9c4412338d6;p=lyx.git

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index bda52f1890..afa2182eb6 100644
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -112,7 +112,7 @@ QString GuiPainter::generateStringSignature(QString const & str, FontInfo const
 }
 
 
-QColor GuiPainter::computeColor(ColorCode col)
+QColor GuiPainter::computeColor(Color col)
 {
 	return filterColor(guiApp->colorCache().get(col));
 }
@@ -144,7 +144,7 @@ QColor GuiPainter::filterColor(QColor const & col)
 }
 
 
-void GuiPainter::enterMonochromeMode(ColorCode const & min, ColorCode const & max)
+void GuiPainter::enterMonochromeMode(Color const & min, Color const & max)
 {
 	QColor qmin = filterColor(guiApp->colorCache().get(min));
 	QColor qmax = filterColor(guiApp->colorCache().get(max));
@@ -161,7 +161,7 @@ void GuiPainter::leaveMonochromeMode()
 }
 
 
-void GuiPainter::point(int x, int y, ColorCode col)
+void GuiPainter::point(int x, int y, Color col)
 {
 	if (!isDrawingEnabled())
 		return;
@@ -172,7 +172,7 @@ void GuiPainter::point(int x, int y, ColorCode col)
 
 
 void GuiPainter::line(int x1, int y1, int x2, int y2,
-	ColorCode col,
+	Color col,
 	line_style ls,
 	line_width lw)
 {
@@ -189,7 +189,7 @@ void GuiPainter::line(int x1, int y1, int x2, int y2,
 
 
 void GuiPainter::lines(int const * xp, int const * yp, int np,
-	ColorCode col,
+	Color col,
 	line_style ls,
 	line_width lw)
 {
@@ -217,7 +217,7 @@ void GuiPainter::lines(int const * xp, int const * yp, int np,
 
 
 void GuiPainter::rectangle(int x, int y, int w, int h,
-	ColorCode col,
+	Color col,
 	line_style ls,
 	line_width lw)
 {
@@ -229,7 +229,7 @@ void GuiPainter::rectangle(int x, int y, int w, int h,
 }
 
 
-void GuiPainter::fillRectangle(int x, int y, int w, int h, ColorCode col)
+void GuiPainter::fillRectangle(int x, int y, int w, int h, Color col)
 {
 	if (!isDrawingEnabled())
 		return;
@@ -239,7 +239,7 @@ void GuiPainter::fillRectangle(int x, int y, int w, int h, ColorCode col)
 
 
 void GuiPainter::arc(int x, int y, unsigned int w, unsigned int h,
-	int a1, int a2, ColorCode col)
+	int a1, int a2, Color col)
 {
 	if (!isDrawingEnabled())
 		return;
@@ -336,6 +336,12 @@ int GuiPainter::text(int x, int y, docstring const & s,
 		textwidth = smallCapsText(x, y, str, f);
 		if (f.underbar() == FONT_ON)
 			underline(f, x, y, textwidth);
+		if (f.strikeout() == FONT_ON)
+			strikeoutLine(f, x, y, textwidth);
+		if (f.uuline() == FONT_ON)
+			doubleUnderline(f, x, y, textwidth);
+		if (f.uwave() == FONT_ON)
+			wavyHorizontalLine(x, y, textwidth, f.realColor().baseColor);
 		return textwidth;
 	}
 
@@ -345,6 +351,13 @@ int GuiPainter::text(int x, int y, docstring const & s,
 	textwidth = fm.width(s);
 	if (f.underbar() == FONT_ON)
 		underline(f, x, y, textwidth);
+	if (f.strikeout() == FONT_ON)
+		strikeoutLine(f, x, y, textwidth);
+	if (f.uuline() == FONT_ON)
+		doubleUnderline(f, x, y, textwidth);
+	if (f.uwave() == FONT_ON)
+		// f.color() doesn't work on some circumstances
+		wavyHorizontalLine(x, y, textwidth,  f.realColor().baseColor);
 
 	if (!isDrawingEnabled())
 		return textwidth;
@@ -405,6 +418,10 @@ int GuiPainter::text(int x, int y, docstring const & s,
 			//LYXERR(Debug::PAINTING, "h=" << h << "  mA=" << mA << "  mD=" << mD
 			//	<< "  w=" << w << "  lb=" << lb << "  tw=" << textwidth
 			//	<< "  rb=" << rb);
+
+			// Draw the new cached pixmap.
+			drawPixmap(x + lb, y - mA, pm);
+
 			return textwidth;
 		}
 	}
@@ -446,7 +463,7 @@ void GuiPainter::buttonFrame(int x, int y, int w, int h)
 
 
 void GuiPainter::rectText(int x, int y, docstring const & str,
-	FontInfo const & font, ColorCode back, ColorCode frame)
+	FontInfo const & font, Color back, Color frame)
 {
 	int width;
 	int ascent;
@@ -516,6 +533,17 @@ int GuiPainter::preeditText(int x, int y, char_type c,
 }
 
 
+void GuiPainter::doubleUnderline(FontInfo const & f, int x, int y, int width)
+{
+	FontMetrics const & fm = theFontMetrics(f);
+
+	int const below = max(fm.maxDescent() / 2, 2);
+
+	line(x, y + below, x + width, y + below, f.realColor());
+	line(x, y + below - 2, x + width, y + below - 2, f.realColor());
+}
+
+
 void GuiPainter::underline(FontInfo const & f, int x, int y, int width)
 {
 	FontMetrics const & fm = theFontMetrics(f);
@@ -530,6 +558,20 @@ void GuiPainter::underline(FontInfo const & f, int x, int y, int width)
 }
 
 
+void GuiPainter::strikeoutLine(FontInfo const & f, int x, int y, int width)
+{
+	FontMetrics const & fm = theFontMetrics(f);
+
+	int const middle = max((fm.maxHeight() / 4), 1);
+	int const height =  middle/3;
+
+	if (height < 2)
+		line(x, y - middle, x + width, y - middle, f.realColor());
+	else
+		fillRectangle(x, y - middle, width, height, f.realColor());
+}
+
+
 void GuiPainter::dashedUnderline(FontInfo const & f, int x, int y, int width)
 {
 	FontMetrics const & fm = theFontMetrics(f);
@@ -544,5 +586,24 @@ void GuiPainter::dashedUnderline(FontInfo const & f, int x, int y, int width)
 		line(x, y + below + n, x + width, y + below + n, f.realColor(), line_onoffdash);
 }
 
+
+void GuiPainter::wavyHorizontalLine(int x, int y, int width, ColorCode col)
+{
+	setQPainterPen(computeColor(col));
+	int const step = 4;
+	int const xend = x + width;
+	int height = 1;
+	//FIXME: I am not sure if Antialiasing gives the best effect.
+	//setRenderHint(Antialiasing, true);
+	while (x < xend) {
+		height = - height;
+		drawLine(x, y - height, x + step, y + height);
+		x += step;
+		drawLine(x, y + height, x + 2, y + height);
+		x += 2;
+	}
+	//setRenderHint(Antialiasing, false);
+}
+
 } // namespace frontend
 } // namespace lyx