X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathRoot.cpp;h=8b86c5965ba3ab6ce02fe5737a4209671dce2f32;hb=64007533a76dd0634d39800dd11da9ef418871ed;hp=f61db16e8f1d9dc3b24ea0c7005199274fe20568;hpb=8361fb603eb92fa54b84a49b3996b382804a5f20;p=lyx.git

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index f61db16e8f..8b86c5965b 100644
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -15,6 +15,7 @@
 
 #include "MathData.h"
 #include "MathStream.h"
+#include "MathSupport.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
@@ -42,27 +43,44 @@ Inset * InsetMathRoot::clone() const
 void InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	Changer dummy = mi.base.changeEnsureMath();
-	cellsMetrics(mi);
-	Dimension const & dim0 = cell(0).dimension(*mi.base.bv);
-	Dimension const & dim1 = cell(1).dimension(*mi.base.bv);
-	dim.asc = max(dim0.ascent()  + 5, dim1.ascent())  + 2;
-	dim.des = max(dim0.descent() - 5, dim1.descent()) + 2;
-	dim.wid = dim0.width() + dim1.width() + 10;
+	Dimension dim0;
+	{
+		Changer script = mi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+		cell(0).metrics(mi, dim0);
+		// make sure that the dim is high enough for any character
+		Dimension fontDim;
+		math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
+		dim0 += fontDim;
+	}
+
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
+	// make sure that the dim is high enough for any character
+	Dimension fontDim;
+	math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
+	dim1 += fontDim;
+
+	dim.asc = max(dim0.ascent()  + 5, dim1.ascent()) + 1;
+	dim.des = max(dim0.descent() - 5, dim1.descent());
+	dim.wid = dim0.width() + dim1.width() + 4;
 }
 
 
 void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const
 {
 	Changer dummy = pi.base.changeEnsureMath();
+	Dimension const dim = dimension(*pi.base.bv);
+	int const a = dim.ascent();
+	int const d = dim.descent();
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
 	int const w = dim0.width();
 	// the "exponent"
-	cell(0).draw(pi, x, y - 5 - dim0.descent());
+	{
+		Changer script = pi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
+		cell(0).draw(pi, x, y + (d - a)/2 - dim0.descent());
+	}
 	// the "base"
-	cell(1).draw(pi, x + w + 8, y);
-	Dimension const dim = dimension(*pi.base.bv);
-	int const a = dim.ascent();
-	int const d = dim.descent();
+	cell(1).draw(pi, x + w + 4, y);
 	int xp[4];
 	int yp[4];
 	pi.pain.line(x + dim.width(), y - a + 1,
@@ -127,8 +145,8 @@ void InsetMathRoot::htmlize(HtmlStream & os) const
 {
 	os << MTag("span", "class='root'")
 	   << MTag("sup") << cell(0) << ETag("sup")
-	   << from_ascii("&radic;") 
-	   << MTag("span", "class='rootof'")	<< cell(1) << ETag("span") 
+	   << from_ascii("&radic;")
+	   << MTag("span", "class='rootof'")	<< cell(1) << ETag("span")
 		 << ETag("span");
 }