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

Fix cursor movement for large logos (#9628)

Browse Source 
Previously, if one clicked onto a large non-editable inset like the new LyX
logo inset, the cursor was always positioned in front of the inset, even if
the click was almost at the back edge. Now the cursor is positioned at the
correct edge. I tested this also with RTL contents, where from means right
and back means left, but the inset anchor position anchor point is still
at the left, and the right edge is dim.wid pixels to the right of it.
This commit is contained in:
Georg Baum 2015-10-11 14:21:45 +02:00
parent 15a5e0f793
commit 359aef92f8
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/TextMetrics.cpp
View File

@ -1323,11 +1323,28 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
cur.setTargetX(x); cur.setTargetX(x);
// Try to descend recursively inside the inset. // Try to descend recursively inside the inset.
inset = inset->editXY(cur, x, yy); Inset * edited = inset->editXY(cur, x, yy);
if (edited == inset && cur.pos() == it->pos) {
// non-editable inset, set cursor after the inset if x is
// nearer to that position (bug 9628)
ParagraphMetrics const & pm = par_metrics_[pit];
Dimension const & dim = pm.insetDimension(inset);
Point p = bv_->coordCache().getInsets().xy(inset);
bool const is_rtl = text_->isRTL(text_->getPar(pit));
if (is_rtl) {
// "in front of" == "right of"
if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x))
cur.posForward();
} else {
// "in front of" == "left of"
if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x))
cur.posForward();
}
}
if (cur.top().text() == text_) if (cur.top().text() == text_)
cur.setCurrentFont(); cur.setCurrentFont();
return inset; return edited;
} }