anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set caret height correctly for cells inside math rows

Browse Source 
The code in 90cfe4ec3 only handled the cells which metrics are
computed directly, and missed those who were linearized inside a MathRow.

To fix this, we use the fact that all the positions in a math row have
the same height and make MathRow::metrics return a boolean indicating
whether it contains a caret for a given bufferview.

Fixes bug #11153.

(cherry picked from commit a3868e40a4)
This commit is contained in:
Jean-Marc Lasgouttes 2018-05-24 11:10:25 +02:00
parent 1c8a53458a
commit 874ad18178
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mathed/MathData.cpp
View File

@ -264,6 +264,13 @@ bool isInside(DocIterator const & it, MathData const & ar,
#endif
bool MathData::hasCaret(BufferView * bv) const
{
Cursor & cur = bv->cursor();
return cur.inMathed() && &cur.cell() == this;
}
void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
{
frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
@ -278,7 +285,7 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
sshift_ = xascent / 4;
MathRow mrow(mi, this);
mrow.metrics(mi, dim);
bool has_caret = mrow.metrics(mi, dim);
mrow_cache_[bv] = mrow;
kerning_ = mrow.kerning(bv);
@ -294,8 +301,8 @@ void MathData::metrics(MetricsInfo & mi, Dimension & dim, bool tight) const
// This is one of the the few points where the drawing font is known,
// so that we can set the caret vertical dimensions.
Cursor & cur = bv->cursor();
if (cur.inMathed() && &cur.cell() == this)
has_caret |= hasCaret(bv);
if (has_caret)
bv->setCaretAscentDescent(min(dim.asc, fm.maxAscent()),
min(dim.des, fm.maxDescent()));

3
src/mathed/MathData.h
View File

@ -124,6 +124,9 @@ public:
/// Add this array to a math row. Return true if contents got added
bool addToMathRow(MathRow &, MetricsInfo & mi) const;
// return true if caret is in this cell in this buffer view
bool hasCaret(BufferView * bv) const;
/// rebuild cached metrics information
/** When \c tight is true, the height of the cell will be at least
* that of 'x'. Otherwise, it will be the max height of the font.

9
src/mathed/MathRow.cpp
View File

@ -234,8 +234,10 @@ int MathRow::after(int i) const
}
void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
bool MathRow::metrics(MetricsInfo & mi, Dimension & dim)
{
bool has_caret = false;
dim.wid = 0;
// In order to compute the dimension of macros and their
// arguments, it is necessary to keep track of them.
@ -260,8 +262,10 @@ void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
d.wid = e.before + e.after;
e.inset->beforeMetrics();
}
if (e.ar)
if (e.ar) {
dim_arrays.push_back(make_pair(e.ar, Dimension()));
has_caret |= e.ar->hasCaret(mi.base.bv);
}
break;
case END:
if (e.inset) {
@ -310,6 +314,7 @@ void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
dim.wid += mathed_string_width(font, e.compl_text);
}
LATTEST(dim_insets.empty() && dim_arrays.empty());
return has_caret;
}

4
src/mathed/MathRow.h
View File

@ -110,8 +110,8 @@ public:
// compute the spacings.
MathRow(MetricsInfo & mi, MathData const * ar);
//
void metrics(MetricsInfo & mi, Dimension & dim);
// this returns true if the caret is here
bool metrics(MetricsInfo & mi, Dimension & dim);
//
void draw(PainterInfo & pi, int const x, int const y) const;