mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 21:40:19 +00:00
Fix bug #11367
The overset, underset, and stackrel insets behave like the script rather than the fraction inset.
This commit is contained in:
parent
77234fecd8
commit
9c3bbeefab
@ -36,7 +36,7 @@ void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
|
|||||||
Changer dummy2 = mi.base.changeEnsureMath();
|
Changer dummy2 = mi.base.changeEnsureMath();
|
||||||
Dimension dim0;
|
Dimension dim0;
|
||||||
cell(0).metrics(mi, dim0);
|
cell(0).metrics(mi, dim0);
|
||||||
Changer dummy = mi.base.changeFrac();
|
Changer dummy = mi.base.changeScript();
|
||||||
Dimension dim1;
|
Dimension dim1;
|
||||||
cell(1).metrics(mi, dim1);
|
cell(1).metrics(mi, dim1);
|
||||||
dim.wid = max(dim1.width(), dim0.wid) + 4;
|
dim.wid = max(dim1.width(), dim0.wid) + 4;
|
||||||
@ -54,7 +54,7 @@ void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
|
|||||||
int m = x + dim.wid / 2;
|
int m = x + dim.wid / 2;
|
||||||
int yo = y - dim0.asc - dim1.des - 1;
|
int yo = y - dim0.asc - dim1.des - 1;
|
||||||
cell(0).draw(pi, m - dim0.wid / 2, y);
|
cell(0).draw(pi, m - dim0.wid / 2, y);
|
||||||
Changer dummy = pi.base.changeFrac();
|
Changer dummy = pi.base.changeScript();
|
||||||
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ void InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
|
|||||||
Changer dummy2 = mi.base.changeEnsureMath();
|
Changer dummy2 = mi.base.changeEnsureMath();
|
||||||
Dimension dim0;
|
Dimension dim0;
|
||||||
cell(0).metrics(mi, dim0);
|
cell(0).metrics(mi, dim0);
|
||||||
Changer dummy = mi.base.changeFrac();
|
Changer dummy = mi.base.changeScript();
|
||||||
Dimension dim1;
|
Dimension dim1;
|
||||||
cell(1).metrics(mi, dim1);
|
cell(1).metrics(mi, dim1);
|
||||||
if (nargs() > 2) {
|
if (nargs() > 2) {
|
||||||
@ -92,7 +92,7 @@ void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
|
|||||||
int m = x + dim.width() / 2;
|
int m = x + dim.width() / 2;
|
||||||
int yo = y - dim0.ascent() - dim1.descent() - 1;
|
int yo = y - dim0.ascent() - dim1.descent() - 1;
|
||||||
cell(0).draw(pi, m - dim0.width() / 2, y);
|
cell(0).draw(pi, m - dim0.width() / 2, y);
|
||||||
Changer dummy = pi.base.changeFrac();
|
Changer dummy = pi.base.changeScript();
|
||||||
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
||||||
if (nargs() > 2) {
|
if (nargs() > 2) {
|
||||||
Dimension const & dim2 = cell(2).dimension(*pi.base.bv);
|
Dimension const & dim2 = cell(2).dimension(*pi.base.bv);
|
||||||
|
@ -35,7 +35,7 @@ void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
|
|||||||
Changer dummy2 = mi.base.changeEnsureMath();
|
Changer dummy2 = mi.base.changeEnsureMath();
|
||||||
Dimension dim0;
|
Dimension dim0;
|
||||||
cell(0).metrics(mi, dim0);
|
cell(0).metrics(mi, dim0);
|
||||||
Changer dummy = mi.base.changeFrac();
|
Changer dummy = mi.base.changeScript();
|
||||||
Dimension dim1;
|
Dimension dim1;
|
||||||
cell(1).metrics(mi, dim1);
|
cell(1).metrics(mi, dim1);
|
||||||
dim.wid = max(dim1.width(), dim0.width()) + 4;
|
dim.wid = max(dim1.width(), dim0.width()) + 4;
|
||||||
@ -53,7 +53,7 @@ void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
|
|||||||
int m = x + dim.wid / 2;
|
int m = x + dim.wid / 2;
|
||||||
int yo = y + dim0.descent() + dim1.ascent() + 1;
|
int yo = y + dim0.descent() + dim1.ascent() + 1;
|
||||||
cell(0).draw(pi, m - dim0.width() / 2, y);
|
cell(0).draw(pi, m - dim0.width() / 2, y);
|
||||||
Changer dummy = pi.base.changeFrac();
|
Changer dummy = pi.base.changeScript();
|
||||||
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
cell(1).draw(pi, m - dim1.width() / 2, yo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user