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

Let getPosNearX take horizontal scrolling into account

Browse Source 
If we do not do that, it is not possible to position the cursor after
a long inset with the mouse.

To do this, it is necessary to add the pit information to the Row
object. This is a good idea in any case, and will allow to simplify
some code later on.

Fixes bug #10094.
This commit is contained in:
Jean-Marc Lasgouttes 2016-05-01 01:27:13 +02:00 committed by Richard Heck
parent 27607b76f5
commit 1639abb8ed
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Row.cpp
View File

@ -148,7 +148,8 @@ Row::Row()
: separator(0), label_hfill(0), left_margin(0), right_margin(0),
sel_beg(-1), sel_end(-1),
begin_margin_sel(false), end_margin_sel(false),
changed_(false), crc_(0), pos_(0), end_(0), right_boundary_(false)
changed_(false), crc_(0),
pit_(0), pos_(0), end_(0), right_boundary_(false)
{}

6
src/Row.h
View File

@ -144,6 +144,10 @@ public:
void setSelectionAndMargins(DocIterator const & beg,
DocIterator const & end) const;
///
void pit(pit_type p) { pit_ = p; }
///
pit_type pit() const { return pit_; }
///
void pos(pos_type p) { pos_ = p; }
///
@ -286,6 +290,8 @@ private:
mutable bool changed_;
/// CRC of row contents.
mutable size_type crc_;
/// Index of the paragraph that contains this row
pit_type pit_;
/// first pos covered by this row
pos_type pos_;
/// one behind last pos covered by this row

15
src/TextMetrics.cpp
View File

@ -443,6 +443,7 @@ bool TextMetrics::redoParagraph(pit_type const pit)
if (row_index == pm.rows().size())
pm.rows().push_back(Row());
Row & row = pm.rows()[row_index];
row.pit(pit);
row.pos(first);
breakRow(row, right_margin, pit);
setRowHeight(row, pit);
@ -1113,6 +1114,16 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
int const xo = origin_.x_;
x -= xo;
int offset = 0;
CursorSlice rowSlice(const_cast<InsetText &>(text_->inset()));
rowSlice.pit() = row.pit();
rowSlice.pos() = row.pos();
// Adapt to cursor row scroll offset if applicable.
if (bv_->currentRowSlice() == rowSlice)
offset = bv_->horizScrollOffset();
x += offset;
pos_type pos = row.pos();
boundary = false;
if (row.empty())
@ -1166,8 +1177,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x,
else
boundary = row.right_boundary();
}
x += xo;
x += xo - offset;
//LYXERR0("getPosNearX ==> pos=" << pos << ", boundary=" << boundary);
return pos;
}

2
src/TextMetrics.h
View File

@ -150,7 +150,7 @@ private:
public:
/// returns the position near the specified x-coordinate of the row.
/// x is an absolute screen coord, it is set to the real beginning
/// of this column.
/// of this column. This takes in account horizontal cursor row scrolling.
pos_type getPosNearX(Row const & row, int & x, bool & boundary) const;
/// returns pos in given par at given x coord.