summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
32e55ec)
MathMetricsInfo::MathMetricsInfo()
MathMetricsInfo::MathMetricsInfo()
- : view(0), inset(0), idx(0), fullredraw(false)
+ : view(0), fullredraw(false)
MathMetricsBase base;
///
BufferView * view;
MathMetricsBase base;
///
BufferView * view;
- /// used to pass some info down
- MathNestInset const * inset;
- ///
- int idx;
void MathNestInset::metrics(MathMetricsInfo const & mi) const
{
MathMetricsInfo m = mi;
void MathNestInset::metrics(MathMetricsInfo const & mi) const
{
MathMetricsInfo m = mi;
- m.inset = this;
- for (idx_type i = 0; i < nargs(); ++i) {
- m.idx = i;
+ for (idx_type i = 0; i < nargs(); ++i)
MathXArray const & MathXYArrowInset::targetCell() const
{
MathXArray const & MathXYArrowInset::targetCell() const
{
MathXYMatrixInset const * p = targetMatrix();
int x = 0;
int y = 0;
MathXYMatrixInset const * p = targetMatrix();
int x = 0;
int y = 0;
n = 0;
}
return p->xcell(n);
n = 0;
}
return p->xcell(n);
+#else
+ static MathXArray dummy;
+ return dummy;
+#endif
}
MathXArray const & MathXYArrowInset::sourceCell() const
{
}
MathXArray const & MathXYArrowInset::sourceCell() const
{
return targetMatrix()->xcell(mi_.idx);
return targetMatrix()->xcell(mi_.idx);
+#else
+ static MathXArray dummy;
+ return dummy;
+#endif
MathNestInset::metrics(mi);
mi_ = mi;
MathFontSetChanger dummy(mi.base, "textrm");
MathNestInset::metrics(mi);
mi_ = mi;
MathFontSetChanger dummy(mi.base, "textrm");
target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
if (editing()) {
target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
if (editing()) {
descent_ = 0;
//mathed_string_dim(font_, "X", ascent_, descent_, width_);
}
descent_ = 0;
//mathed_string_dim(font_, "X", ascent_, descent_, width_);
}
int lasc;
int ldes;
int lwid;
int lasc;
int ldes;
int lwid;
xcell(1).draw(pi, x + lwid, y);
drawStr(pi, pi.base.font, x + 3, y, "label");
xcell(1).draw(pi, x + lwid, y);
drawStr(pi, pi.base.font, x + 3, y, "label");
- //drawStr(pi, font_, x, y, "X");
+ drawStr(pi, font_, x, y, "X");
MathXArray const & s = sourceCell();
MathXArray const & t = targetCell();
pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
MathXArray const & s = sourceCell();
MathXArray const & t = targetCell();
pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);