anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-24 09:04:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify and hopely fix scrollToCursor

Browse Source 
Remove some special cases that I do not really understand and
streamline the cases.

Also make sure that there is only one code path for centering.

Fixes bug #12491.
This commit is contained in:
Jean-Marc Lasgouttes 2022-11-13 21:03:33 +01:00
parent 1470a7b864
commit 0fed10e4c3
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BufferView.cpp
View File

@ -995,9 +995,11 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter, bo
return false; return false;
if (recenter) if (recenter)
LYXERR(Debug::SCROLLING, "recentering and scrolling to cursor"); LYXERR(Debug::SCROLLING, "Centering cursor in workarea");
else if (force)
LYXERR(Debug::SCROLLING, "Setting cursor to top of workarea");
else else
LYXERR(Debug::SCROLLING, "scrolling to cursor"); LYXERR(Debug::SCROLLING, "Making sure cursor is visible in workarea");
CursorSlice const & bot = dit.bottom(); CursorSlice const & bot = dit.bottom();
TextMetrics & tm = textMetrics(bot.text()); TextMetrics & tm = textMetrics(bot.text());
@ -1016,7 +1018,7 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter, bo
else if (bot_pit == tm.last().first + 1) else if (bot_pit == tm.last().first + 1)
tm.newParMetricsDown(); tm.newParMetricsDown();
if (tm.contains(bot_pit) && !force) { if (tm.contains(bot_pit) && !force && !recenter) {
ParagraphMetrics const & pm = tm.parMetrics(bot_pit); ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
LBUFERR(!pm.rows().empty()); LBUFERR(!pm.rows().empty());
// FIXME: smooth scrolling doesn't work in mathed. // FIXME: smooth scrolling doesn't work in mathed.
@ -1027,14 +1029,12 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter, bo
Dimension const & row_dim = Dimension const & row_dim =
inner_pm.getRow(cs.pos(), dit.boundary()).dim(); inner_pm.getRow(cs.pos(), dit.boundary()).dim();
int scrolled = 0; int scrolled = 0;
if (recenter)
scrolled = scroll(ypos - height_/2);
// We try to visualize the whole row, if the row height is larger than // We try to visualize the whole row, if the row height is larger than
// the screen height, we scroll to a heuristic value of height_ / 4. // the screen height, we scroll to a heuristic value of height_ / 4.
// FIXME: This heuristic value should be replaced by a recursive search // FIXME: This heuristic value should be replaced by a recursive search
// for a row in the inset that can be visualized completely. // for a row in the inset that can be visualized completely.
else if (row_dim.height() > height_) { if (row_dim.height() > height_) {
if (ypos < defaultRowHeight()) if (ypos < defaultRowHeight())
scrolled = scroll(ypos - height_ / 4); scrolled = scroll(ypos - height_ / 4);
else if (ypos > height_ - defaultRowHeight()) else if (ypos > height_ - defaultRowHeight())
@ -1063,28 +1063,20 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter, bo
d->inlineCompletionPos_ = DocIterator(); d->inlineCompletionPos_ = DocIterator();
tm.redoParagraph(bot_pit); tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
int const offset = coordOffset(dit).y_; int const offset = coordOffset(dit).y_;
d->anchor_pit_ = bot_pit; d->anchor_pit_ = bot_pit;
CursorSlice const & cs = dit.innerTextSlice(); CursorSlice const & cs = dit.innerTextSlice();
ParagraphMetrics const & inner_pm = ParagraphMetrics const & inner_pm =
textMetrics(cs.text()).parMetrics(cs.pit()); textMetrics(cs.text()).parMetrics(cs.pit());
Dimension const & row_dim = Dimension const & row_dim =
inner_pm.getRow(cs.pos(), dit.boundary()).dim(); inner_pm.getRow(cs.pos(), dit.boundary()).dim();
int const old_ypos = d->anchor_ypos_;
d->anchor_ypos_ = - offset + row_dim.ascent();
if (recenter) if (recenter)
d->anchor_ypos_ = height_/2; d->anchor_ypos_ += height_/2 - row_dim.height() / 2;
else if (d->anchor_pit_ == 0) return d->anchor_ypos_ != old_ypos;
d->anchor_ypos_ = offset + pm.ascent();
else if (d->anchor_pit_ == max_pit)
d->anchor_ypos_ = height_ - offset - row_dim.descent();
else if (offset > height_)
d->anchor_ypos_ = height_ - offset - row_dim.descent();
else
d->anchor_ypos_ = row_dim.ascent();
return true;
} }