several smallish changes/bugfixes/left overs from Porto

[lyx.git] / src / mathed / math_boxinset.C

diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C
index b2ed64015f875667382793ff64fffec246bb6e15..3d5f14b6adc567282a8dd5dc285795b90172d518 100644 (file)
--- a/src/mathed/math_boxinset.C
+++ b/src/mathed/math_boxinset.C
@@ -5,13 +5,11 @@
 #endif
 
 #include "math_boxinset.h"
-#include "support/LOstream.h"
-#include "debug.h"
-#include "Painter.h"
-#include "math_cursor.h"
+#include "math_support.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
+
 MathBoxInset::MathBoxInset(string const & name)
        : MathGridInset(1, 1), name_(name)
 {}
@@ -43,11 +41,16 @@ void MathBoxInset::rebreak()
 }
 
 
-void MathBoxInset::draw(Painter & pain, int x, int y) const
+void MathBoxInset::metrics(MathMetricsInfo & mi) const
+{
+       MathFontSetChanger dummy(mi.base, "textnormal");
+       MathGridInset::metrics(mi);
+}
+
+
+void MathBoxInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       MathGridInset::draw(pain, x, y);
-       if (mathcursor && mathcursor->isInside(this)) {
-               pain.rectangle(x - 1, y - ascent() - 1, width(), height(),
-                       LColor::mathframe);
-       }
+       MathFontSetChanger dummy(pi.base, "textnormal");
+       MathGridInset::draw(pi, x, y);
+       mathed_draw_framebox(pi, x, y, this);
 }