#include "Cursor.h"
#include "LaTeXFeatures.h"
+using namespace std;
namespace lyx {
void InsetMathOverset::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() + cell(0).height() + 4;
- dim.des = cell(1).descent();
+ Dimension dim0;
+ cell(0).metrics(mi, dim0);
+ dim.wid = max(dim0.width(), dim1.wid) + 4;
+ dim.asc = dim1.asc + dim0.height() + 4;
+ dim.des = dim1.des;
metricsMarkers(dim);
- // Cache the inset dimension.
- setDimCache(mi, dim);
}
void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
{
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 - cell(1).ascent() - cell(0).descent() - 1;
- cell(1).draw(pi, m - cell(1).width() / 2, y);
+ int yo = y - dim1.asc - dim0.des - 1;
+ cell(1).draw(pi, m - dim1.wid / 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);
}