Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

[lyx.git] / src / mathed / InsetMathBrace.cpp

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index d74136b4844e5d4f75ec6ff03b7e1ed5617674f3..d5b6da44dc768f3cb3f09a8fea6a8ba4570eaff4 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -11,15 +11,18 @@
 #include <config.h>
 
 #include "InsetMathBrace.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "Color.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
+
+using namespace std;
 
 namespace lyx {
 
@@ -41,29 +44,27 @@ Inset * InsetMathBrace::clone() const
 }
 
 
-bool InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi);
+       Dimension dim0;
+       cell(0).metrics(mi, dim0);
        Dimension t = theFontMetrics(mi.base.font).dimension('{');
-       dim.asc = std::max(cell(0).ascent(), t.asc);
-       dim.des = std::max(cell(0).descent(), t.des);
-       dim.wid = cell(0).width() + 2 * t.wid;
+       dim.asc = max(dim0.asc, t.asc);
+       dim.des = max(dim0.des, t.des);
+       dim.wid = dim0.width() + 2 * t.wid;
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }
 
 
 void InsetMathBrace::draw(PainterInfo & pi, int x, int y) const
 {
-       Font font = pi.base.font;
-       font.setColor(Color::latex);
+       FontInfo font = pi.base.font;
+       font.setColor(Color_latex);
        Dimension t = theFontMetrics(font).dimension('{');
        pi.pain.text(x, y, '{', font);
        cell(0).draw(pi, x + t.wid, y);
-       pi.pain.text(x + t.wid + cell(0).width(), y, '}', font);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+       pi.pain.text(x + t.wid + dim0.width(), y, '}', font);
        drawMarkers(pi, x, y);
 }