X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=3d048a5b79b9dcdb52d5bf2263f1b98ffe03bd6b;hpb=4366ef931c28ef76e01b2c0fdbb0f515f1e0cdbd;p=lyx.git

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 3d048a5b79..16f8c3c58b 100644
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -27,8 +27,8 @@
 #include "math_mathmlstream.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "Painter.h"
-#include "font.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
 #include "support/lyxlib.h"
 #include "support/LOstream.h"
 #include "debug.h"
@@ -47,10 +47,10 @@ InsetFormulaMacro::InsetFormulaMacro()
 }
 
 
-InsetFormulaMacro::InsetFormulaMacro(string name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 {
 	setInsetName(name);
-	MathMacroTable::create(name, nargs, string());
+	MathMacroTable::create(name, nargs);
 }
 
 
@@ -99,7 +99,7 @@ int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
 {
 	return ascii(buf, os, 0);
 }
@@ -136,7 +136,7 @@ int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
 int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
 {
 	metrics(bv, f);
-	return 10 + lyxfont::width(prefix(), f) + par()->width();
+	return 10 + font_metrics::width(prefix(), f) + par()->width();
 }
 
 
@@ -165,31 +165,34 @@ MathInsetTypes InsetFormulaMacro::getType() const
 
 
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-			     int y, float & x, bool /*cleared*/) const
+			     int y, float & xx, bool /*cleared*/) const
 {
-	Painter & pain = bv->painter();
+	MathPainterInfo pain = MathPainterInfo(bv->painter());
 	LyXFont font(f);
 
 	// label
 	font.setColor(LColor::math);
 
+	int const x = int(xx);
 	int const a = y - ascent(bv, font) + 1;
 	int const w = width(bv, font) - 2;
 	int const h = ascent(bv, font) + descent(bv, font) - 2;
 
 	// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
-	pain.fillRectangle(int(x), a , w, h, LColor::mathmacrobg);
-	pain.rectangle(int(x), a, w, h, LColor::mathframe);
+	pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+	pain.pain.rectangle(x, a, w, h, LColor::mathframe);
 
 	if (mathcursor &&
 			const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
 		mathcursor->drawSelection(pain);
 
-	pain.text(int(x + 2), y, prefix(), font);
-	x += width(bv, font);
+	pain.pain.text(x + 2, y, prefix(), font);
 
 	// formula
-	xo_ = int(x) - par()->width() - 5;
+	par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+	xx += w + 2;
+	xo_ = x;
 	yo_ = y;
-	par()->draw(pain, xo_, yo_);
+
+	setCursorVisible(false);
 }