X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=908a887eebb5bbea01d8a944d3885293b42a2acc;hb=0cba074ecf0e25ede759ee1f817a7cfec06537d6;hp=cd34d4d241b29d8210939305074fc8d779567771;hpb=b2b8733096543b80b918375cc8a0e1fa6c5fd8b8;p=lyx.git

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index cd34d4d241..908a887eeb 100644
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -105,9 +105,7 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	bool really_change_font = currentMode() == TEXT_MODE
-				&& isMathFont(mi.base.fontname);
-	Changer dummy = mi.base.changeFontSet("textnormal", really_change_font);
+	Changer dummy = mi.base.changeEnsureMath(currentMode());
 
 	cell(0).metrics(mi, dim);
 
@@ -121,26 +119,20 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 		dy_ = dim.des + 1;
 		dim.des += dh_ + 2;
 	}
-
-	metricsMarkers(dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-	bool really_change_font = currentMode() == TEXT_MODE
-		                      && isMathFont(pi.base.fontname);
-	Changer dummy = pi.base.changeFontSet("textnormal", really_change_font);
+	Changer dummy = pi.base.changeEnsureMath(currentMode());
 
-	cell(0).draw(pi, x + 1, y);
+	cell(0).draw(pi, x, y);
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
 	if (wide())
 		mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
 	else
 		mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
 			y + dy_, dw_, dh_, key_->name);
-	drawMarkers(pi, x, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -217,7 +209,7 @@ namespace {
 			buildTranslationMap(t);
 		return t;
 	}
-}
+} // namespace
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {