if (height_ == 0)
return;
+ // We prefer fixed size line scrolling.
+ d->scrollbarParameters_.single_step = defaultRowHeight();
+ // We prefer full screen page scrolling.
+ d->scrollbarParameters_.page_step = height_;
+
Text & t = buffer_.text();
TextMetrics & tm = d->text_metrics_[&t];
d->par_height_.resize(parsize, defaultRowHeight() * 2);
}
- // It would be better to fix the scrollbar to understand
- // values in [0..1] and divide everything by wh
-
// Look at paragraph heights on-screen
pair<pit_type, ParagraphMetrics const *> first = tm.first();
pair<pit_type, ParagraphMetrics const *> last = tm.last();
<< d->par_height_[pit]);
}
-
- // Build temporary cursor.
- Cursor cur(*this);
- cur.push(buffer_.inset());
- /*Inset * inset =*/ tm.editXY(cur, 0, 10);
- pit_type const first_visible_pit = cur.bottom().pit();
- d->scrollbarParameters_.position = coordOffset(cur, cur.boundary()).y_;
- d->scrollbarParameters_.position -=
- tm.parMetrics(first_visible_pit).position();
- // FIXME: The screen position (0, 10) works reasonably well for most texts
- // but the top and bottom positions are still not quite correct.
- LYXERR(Debug::SCROLLING, "first visible pit : " << first_visible_pit);
- LYXERR(Debug::SCROLLING, "offset from top : "
- << d->scrollbarParameters_.position);
-
- d->scrollbarParameters_.height = 0;
- for (size_t i = 0; i != d->par_height_.size(); ++i) {
- if (i == first_visible_pit)
- d->scrollbarParameters_.position += d->scrollbarParameters_.height;
- d->scrollbarParameters_.height += d->par_height_[i];
+ int top_pos = first.second->position() - first.second->ascent();
+ int bottom_pos = last.second->position() + last.second->descent();
+ bool first_visible = first.first == 0 && top_pos >= 0;
+ bool last_visible = last.first == parsize - 1 && bottom_pos <= height_;
+ if (first_visible && last_visible) {
+ d->scrollbarParameters_.min = 0;
+ d->scrollbarParameters_.max = 0;
+ return;
}
- // We prefer fixed size line scrolling.
- d->scrollbarParameters_.lineScrollHeight = defaultRowHeight();
+ d->scrollbarParameters_.min = top_pos;
+ for (size_t i = 0; i != first.first; ++i)
+ d->scrollbarParameters_.min -= d->par_height_[i];
+ d->scrollbarParameters_.max = bottom_pos;
+ for (size_t i = last.first + 1; i != parsize; ++i)
+ d->scrollbarParameters_.max += d->par_height_[i];
+
+ d->scrollbarParameters_.position = 0;
+ // The reference is the top position so we remove one page.
+ d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
}
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();
int const chars_blanks = countChars(from, to, true);
docstring message;
if (cur.selection())
- message = _("Statistics for the selection:\n");
+ message = _("Statistics for the selection:");
else
- message = _("Statistics for the document:\n");
+ message = _("Statistics for the document:");
+ message += "\n\n";
if (words != 1)
- message += bformat(_("\n%1$d words"), words);
+ message += bformat(_("%1$d words"), words);
else
- message += _("\nOne word");
+ message += _("One word");
+ message += "\n";
if (chars_blanks != 1)
- message += bformat(_("\n%1$d characters (including blanks)"),
+ message += bformat(_("%1$d characters (including blanks)"),
chars_blanks);
else
- message += _("\nOne character (including blanks)");
+ message += _("One character (including blanks)");
+ message += "\n";
if (chars != 1)
- message += bformat(_("\n%1$d characters (excluding blanks)"),
+ message += bformat(_("%1$d characters (excluding blanks)"),
chars);
else
- message += _("\nOne character (excluding blanks)");
+ message += _("One character (excluding blanks)");
Alert::information(_("Statistics"), message);
}
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();
+ }
}
{
string const scroll_type = cmd.getArg(0);
int const scroll_step =
- (scroll_type == "line")? d->scrollbarParameters_.lineScrollHeight
- : (scroll_type == "page")? height_ : 0;
+ (scroll_type == "line")? d->scrollbarParameters_.single_step
+ : (scroll_type == "page")? d->scrollbarParameters_.page_step : 0;
if (scroll_step == 0)
return;
string const scroll_quantity = cmd.getArg(1);
// 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: "