X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_decorationinset.C;h=32693a56672bf09be942f1301767cb4b23a8aa33;hb=254272868f1d891b9d0a778f871afb23cce84081;hp=a5f9409688275d7f6cb5e52bed026db4b8e5ca57;hpb=858355fb69e30dbfbe84fb023076b5ac4ad7b0ec;p=lyx.git

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index a5f9409688..32693a5667 100644
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -9,6 +9,7 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "support/LOstream.h"
 
 
 MathDecorationInset::MathDecorationInset(string const & name)
@@ -17,7 +18,7 @@ MathDecorationInset::MathDecorationInset(string const & name)
 
 
 MathInset * MathDecorationInset::clone() const
-{   
+{
 	return new MathDecorationInset(*this);
 }
 
@@ -74,14 +75,14 @@ bool MathDecorationInset::wide() const
 }
 
 
-void MathDecorationInset::metrics(MathMetricsInfo const & mi) const
+void MathDecorationInset::metrics(MathMetricsInfo & mi) const
 {
 	xcell(0).metrics(mi);
 	width_   = xcell(0).width();
 	ascent_  = xcell(0).ascent();
 	descent_ = xcell(0).descent();
 
-	dh_ = 6; //mathed_char_height(LM_TC_VAR, mi(), 'I', ascent_, descent_);  
+	dh_ = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
 	dw_ = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
 
 	if (upper()) {
@@ -91,16 +92,21 @@ void MathDecorationInset::metrics(MathMetricsInfo const & mi) const
 		dy_ = descent_ + 1;
 		descent_ += dh_ + 2;
 	}
+
+	// for the angular markers
+	descent_ += 2;
+	width_   += 2;
 }
 
 
-void MathDecorationInset::draw(Painter & pain, int x, int y) const
-{ 
-	xcell(0).draw(pain, x, y);
-	if (wide()) 
-		mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
+void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+	xcell(0).draw(pi, x + 1, y);
+	if (wide())
+		mathed_draw_deco(pi, x + 1, y + dy_, width_, dh_, name_);
 	else
-		mathed_draw_deco(pain, x + (width_ - dw_) / 2, y + dy_, dw_, dh_, name_);
+		mathed_draw_deco(pi, x + 1 + (width_ - dw_) / 2, y + dy_, dw_, dh_, name_);
+	drawMarkers(pi, x, y);
 }
 
 
@@ -116,3 +122,9 @@ void MathDecorationInset::normalize(NormalStream & os) const
 {
 	os << "[deco " << name_ << ' ' <<  cell(0) << ']';
 }
+
+
+void MathDecorationInset::infoize(std::ostream & os) const
+{
+	os << "Deco: " << name_;
+}