mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Set vertical lines in math arrays correctly on Y axis
This is a fixup to commit39329935
. The two fixes are * add forgotten offset `y' when drawing the line * in order to have a continuous vertical line, draw from the offset of the previous row. Fixes bug #10363. (cherry-picked froma27ff136
)
This commit is contained in:
parent
1cbc3b6e54
commit
69f0efd797
@ -618,7 +618,7 @@ void InsetMathGrid::drawWithMargin(PainterInfo & pi, int x, int y,
|
|||||||
col_type const c = col(idx);
|
col_type const c = col(idx);
|
||||||
if (r > 0 && r < nrows()) {
|
if (r > 0 && r < nrows()) {
|
||||||
for (unsigned int i = 0; i < rowinfo_[r].lines_; ++i) {
|
for (unsigned int i = 0; i < rowinfo_[r].lines_; ++i) {
|
||||||
int yy = y + rowinfo_[r].offset_
|
int const yy = y + rowinfo_[r].offset_
|
||||||
- rowinfo_[r].ascent_
|
- rowinfo_[r].ascent_
|
||||||
- i * hlinesep()
|
- i * hlinesep()
|
||||||
- hlinesep()/2 - rowsep()/2;
|
- hlinesep()/2 - rowsep()/2;
|
||||||
@ -631,14 +631,17 @@ void InsetMathGrid::drawWithMargin(PainterInfo & pi, int x, int y,
|
|||||||
}
|
}
|
||||||
if (c > 0 && c < ncols()) {
|
if (c > 0 && c < ncols()) {
|
||||||
for (unsigned int i = 0; i < colinfo_[c].lines_; ++i) {
|
for (unsigned int i = 0; i < colinfo_[c].lines_; ++i) {
|
||||||
int xx = x + lmargin
|
int const xx = x + lmargin
|
||||||
+ colinfo_[c].offset_
|
+ colinfo_[c].offset_
|
||||||
- i * vlinesep()
|
- i * vlinesep()
|
||||||
- vlinesep()/2 - colsep()/2;
|
- vlinesep()/2 - colsep()/2;
|
||||||
pi.pain.line(xx,
|
int top_offset;
|
||||||
rowinfo_[r].offset_ - rowinfo_[r].ascent_,
|
if (r > 0)
|
||||||
xx,
|
top_offset = rowinfo_[r - 1].offset_ + rowinfo_[r - 1].descent_;
|
||||||
rowinfo_[r].offset_ + rowinfo_[r].descent_,
|
else
|
||||||
|
top_offset = rowinfo_[0].offset_- rowinfo_[0].ascent_;
|
||||||
|
pi.pain.line(xx, y + top_offset,
|
||||||
|
xx, y + rowinfo_[r].offset_ + rowinfo_[r].descent_,
|
||||||
Color_foreground);
|
Color_foreground);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -120,6 +120,7 @@ What's new
|
|||||||
|
|
||||||
- Remove duplicate context menu item for Argument insets (bug 10368).
|
- Remove duplicate context menu item for Argument insets (bug 10368).
|
||||||
|
|
||||||
|
- Fix display of vertical lines inside math matrices (bug 10363).
|
||||||
|
|
||||||
* INTERNALS
|
* INTERNALS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user