return;
}
- int par_pos = 0;
- for (size_t i = 0; i != d->par_height_.size(); ++i) {
+ // cut off at the top
+ if (value <= d->scrollbarParameters_.min) {
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to top");
+ return;
+ }
+
+ // cut off at the bottom
+ if (value >= d->scrollbarParameters_.max) {
+ DocIterator dit = doc_iterator_end(buffer_.inset());
+ dit.backwardPos();
+ showCursor(dit);
+ LYXERR(Debug::SCROLLING, "scroll to bottom");
+ return;
+ }
+
+ // find paragraph at target position
+ int par_pos = d->scrollbarParameters_.min;
+ pit_type i = 0;
+ for (; i != d->par_height_.size(); ++i) {
par_pos += d->par_height_[i];
- if (par_pos >= value) {
- d->anchor_pit_ = pit_type(i);
+ if (par_pos >= value)
break;
- }
}
- LYXERR(Debug::SCROLLING, "value = " << value
- << "\tanchor_ref_ = " << d->anchor_pit_
- << "\tpar_pos = " << par_pos);
+ if (par_pos < value) {
+ // It seems we didn't find the correct pit so stay on the safe side and
+ // scroll to bottom.
+ LYXERR0("scrolling position not found!");
+ scrollDocView(d->scrollbarParameters_.max);
+ return;
+ }
- d->anchor_ypos_ = par_pos - value;
- updateMetrics();
- buffer_.changed();
+ DocIterator dit = doc_iterator_begin(buffer_.inset());
+ dit.pit() = i;
+ LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i);
+ showCursor(dit);
}
void BufferView::showCursor()
+{
+ showCursor(d->cursor_);
+}
+
+
+void BufferView::showCursor(DocIterator const & dit)
{
// We are not properly started yet, delay until resizing is
// done.
LYXERR(Debug::SCROLLING, "recentering!");
- CursorSlice & bot = d->cursor_.bottom();
+ CursorSlice const & bot = dit.bottom();
TextMetrics & tm = d->text_metrics_[bot.text()];
pos_type const max_pit = pos_type(bot.text()->paragraphs().size() - 1);
- int bot_pit = d->cursor_.bottom().pit();
+ int bot_pit = bot.pit();
if (bot_pit > max_pit) {
// FIXME: Why does this happen?
LYXERR0("bottom pit is greater that max pit: "
if (tm.has(bot_pit)) {
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+ BOOST_ASSERT(!pm.rows().empty());
+ // FIXME: smooth scrolling doesn't work in mathed.
+ CursorSlice const & cs = dit.innerTextSlice();
+ int offset = coordOffset(dit, dit.boundary()).y_;
int ypos = pm.position() + offset;
- Dimension const & row_dim = d->cursor_.textRow().dimension();
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
if (ypos - row_dim.ascent() < 0)
scrollUp(- ypos + row_dim.ascent());
else if (ypos + row_dim.descent() > height_)
tm.redoParagraph(bot_pit);
ParagraphMetrics const & pm = tm.parMetrics(bot_pit);
- int offset = coordOffset(d->cursor_, d->cursor_.boundary()).y_;
+ int offset = coordOffset(dit, dit.boundary()).y_;
d->anchor_pit_ = bot_pit;
- Dimension const & row_dim = d->cursor_.textRow().dimension();
+ CursorSlice const & cs = dit.innerTextSlice();
+ Dimension const & row_dim =
+ pm.getRow(cs.pos(), dit.boundary()).dimension();
if (d->anchor_pit_ == 0)
d->anchor_ypos_ = offset + pm.ascent();
void BufferView::resize(int width, int height)
{
+ bool initialResize = (height_ == 0);
+
// Update from work area
width_ = width;
height_ = height;
d->par_height_.clear();
updateMetrics();
+
+ // view got his initial size, make sure that
+ // the cursor has a proper position
+ if (initialResize) {
+ updateScrollbar();
+ showCursor();
+ }
}
// Rebreak anchor paragraph.
tm.redoParagraph(d->anchor_pit_);
ParagraphMetrics & anchor_pm = tm.par_metrics_[d->anchor_pit_];
+
+ // position anchor
+ if (d->anchor_pit_ == 0) {
+ int scrollRange = d->scrollbarParameters_.max - d->scrollbarParameters_.min;
+
+ // Complete buffer visible? Then it's easy.
+ if (scrollRange == 0)
+ d->anchor_ypos_ = anchor_pm.ascent();
+
+ // FIXME: Some clever handling needed to show
+ // the _first_ paragraph up to the top if the cursor is
+ // in the first line.
+ }
anchor_pm.setPosition(d->anchor_ypos_);
LYXERR(Debug::PAINTING, "metrics: "