X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=aff3fb6c634847b94e20b86f315c50985547b381;hb=02e82157ec583c3900e359de86be79fac6512387;hp=509977b2fbd10ae12a929b6c3795c2e9b2a4b6f2;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 509977b2fb..aff3fb6c63 100644
--- a/src/mathed/InsetMathBox.cpp
+++ b/src/mathed/InsetMathBox.cpp
@@ -24,6 +24,7 @@
 
 #include "frontends/Painter.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace lyx::support;
@@ -80,15 +81,15 @@ void InsetMathBox::htmlize(HtmlStream & ms) const
 
 void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathBox::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	cell(0).draw(pi, x, y);
 	drawMarkers(pi, x, y);
 }
@@ -132,9 +133,9 @@ InsetMathFBox::InsetMathFBox(Buffer * buf)
 
 void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	cell(0).metrics(mi, dim);
-	metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+	metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space
 }
 
 
@@ -143,9 +144,8 @@ void InsetMathFBox::draw(PainterInfo & pi, int x, int y) const
 	Dimension const dim = dimension(*pi.base.bv);
 	pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
 		dim.width() - 2, dim.height() - 2, Color_foreground);
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	cell(0).draw(pi, x + 3, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -218,7 +218,7 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
 
 void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, "textnormal");
+	Changer dummy = mi.base.changeFontSet("textnormal");
 	
 	Dimension wdim;
 	static docstring bracket = from_ascii("[");
@@ -245,7 +245,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.des += 1;
 	}
 	
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
@@ -253,7 +253,7 @@ void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 {
 	drawMarkers(pi, x, y);
 	
-	FontSetChanger dummy(pi.base, "textnormal");
+	Changer dummy = pi.base.changeFontSet("textnormal");
 	BufferView const & bv = *pi.base.bv;
 	int w = mathed_char_width(pi.base.font, '[');
 	
@@ -359,7 +359,7 @@ InsetMathBoxed::InsetMathBoxed(Buffer * buf)
 void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	cell(0).metrics(mi, dim);
-	metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
+	metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space
 }
 
 
@@ -369,7 +369,6 @@ void InsetMathBoxed::draw(PainterInfo & pi, int x, int y) const
 	pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
 		dim.width() - 2, dim.height() - 2, Color_foreground);
 	cell(0).draw(pi, x + 3, y);
-	setPosCache(pi, x, y);
 }