X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathUnderset.cpp;h=7fd57abee36492cd206e283cb4fc225bc2adab79;hb=58ab972f714309aa87e7d956ceda00e18337875f;hp=8a2f4bf02b606973d49a621d9c931814cdda63fd;hpb=ed858d73e57ce7aa89e38c1bc4d799362edb0227;p=lyx.git

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 8a2f4bf02b..7fd57abee3 100644
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -26,29 +26,32 @@ Inset * InsetMathUnderset::clone() const
 }
 
 
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	cell(1).metrics(mi);
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
 	FracChanger dummy(mi.base);
-	cell(0).metrics(mi);
-	dim.wid = std::max(cell(0).width(), cell(1).width()) + 4;
-	dim.asc = cell(1).ascent();
-	dim.des = cell(1).descent() + cell(0).height() + 4;
+	Dimension dim0;
+	cell(0).metrics(mi, dim0);
+	dim.wid = std::max(dim0.width(), dim1.width()) + 4;
+	dim.asc = dim1.ascent();
+	dim.des = dim1.descent() + dim0.height() + 4;
 	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
+	// Cache the inset dimension. 
+	setDimCache(mi, dim);
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
-	int m  = x + width() / 2;
-	int yo = y + cell(1).descent() + cell(0).ascent() + 1;
-	cell(1).draw(pi, m - cell(1).width() / 2, y);
+	Dimension const dim = dimension(*pi.base.bv);
+	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+	Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+	int m  = x + dim.wid / 2;
+	int yo = y + dim1.descent() + dim0.ascent() + 1;
+	cell(1).draw(pi, m - dim1.width() / 2, y);
 	FracChanger dummy(pi.base);
-	cell(0).draw(pi, m - cell(0).width() / 2, yo);
+	cell(0).draw(pi, m - dim0.width() / 2, yo);
 	drawMarkers(pi, x, y);
 }