Painter::wavyHorizontalLine(): new method for inline spellcheck purpose.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 3b31fd5b5f0192eeb9e0770f1d0bb35dadf1c1bf..ad4e15fb2862869a3f573debcc732982fc6542b7 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -517,7 +517,10 @@ void BufferView::updateScrollbar()
 
        d->scrollbarParameters_.position = 0;
        // The reference is the top position so we remove one page.
-       d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
+       if (lyxrc.scroll_below_document)
+               d->scrollbarParameters_.max -= minVisiblePart();
+       else
+               d->scrollbarParameters_.max -= d->scrollbarParameters_.page_step;
 }
 
 
@@ -787,18 +790,37 @@ int BufferView::workWidth() const
 }
 
 
+void BufferView::recenter()
+{
+       showCursor(d->cursor_, true);
+}
+
+
 void BufferView::showCursor()
 {
-       showCursor(d->cursor_);
+       showCursor(d->cursor_, false);
+}
+
+
+void BufferView::showCursor(DocIterator const & dit, bool recenter)
+{
+       if (scrollToCursor(dit, recenter))
+               buffer_.changed();
+}
+
+
+void BufferView::scrollToCursor()
+{
+       scrollToCursor(d->cursor_, false);
 }
 
 
-void BufferView::showCursor(DocIterator const & dit)
+bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter)
 {
        // We are not properly started yet, delay until resizing is
        // done.
        if (height_ == 0)
-               return;
+               return false;
 
        LYXERR(Debug::SCROLLING, "recentering!");
 
@@ -829,7 +851,9 @@ void BufferView::showCursor(DocIterator const & dit)
                Dimension const & row_dim =
                        pm.getRow(cs.pos(), dit.boundary()).dimension();
                int scrolled = 0;
-               if (ypos - row_dim.ascent() < 0)
+               if (recenter)
+                       scrolled = scroll(ypos - height_/2);
+               else if (ypos - row_dim.ascent() < 0)
                        scrolled = scrollUp(- ypos + row_dim.ascent());
                else if (ypos + row_dim.descent() > height_)
                        scrolled = scrollDown(ypos - height_ + defaultRowHeight() ); 
@@ -837,9 +861,9 @@ void BufferView::showCursor(DocIterator const & dit)
                // else, nothing to do, the cursor is already visible so we just return.
                if (scrolled != 0) {
                        updateMetrics();
-                       buffer_.changed();
+                       return true;
                }
-               return;
+               return false;
        }
 
        // fix inline completion position
@@ -855,7 +879,9 @@ void BufferView::showCursor(DocIterator const & dit)
        Dimension const & row_dim =
                pm.getRow(cs.pos(), dit.boundary()).dimension();
 
-       if (d->anchor_pit_ == 0)
+       if (recenter)
+               d->anchor_ypos_ = height_/2;
+       else if (d->anchor_pit_ == 0)
                d->anchor_ypos_ = offset + pm.ascent();
        else if (d->anchor_pit_ == max_pit)
                d->anchor_ypos_ = height_ - offset - row_dim.descent();
@@ -865,7 +891,7 @@ void BufferView::showCursor(DocIterator const & dit)
                d->anchor_ypos_ = defaultRowHeight() * 2;
 
        updateMetrics();
-       buffer_.changed();
+       return true;
 }
 
 
@@ -904,6 +930,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
        case LFUN_MARK_ON:
        case LFUN_MARK_TOGGLE:
        case LFUN_SCREEN_RECENTER:
+       case LFUN_SCREEN_SHOW_CURSOR:
        case LFUN_BIBTEX_DATABASE_ADD:
        case LFUN_BIBTEX_DATABASE_DEL:
        case LFUN_NOTES_MUTATE:
@@ -1295,9 +1322,13 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                cur.resetAnchor();
                break;
 
-       case LFUN_SCREEN_RECENTER:
+       case LFUN_SCREEN_SHOW_CURSOR:
                showCursor();
                break;
+       
+       case LFUN_SCREEN_RECENTER:
+               recenter();
+               break;
 
        case LFUN_BIBTEX_DATABASE_ADD: {
                Cursor tmpcur = d->cursor_;
@@ -1448,12 +1479,17 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        p = Point(0, 0);
                if (cmd.action == LFUN_SCREEN_DOWN && scrolled < height_)
                        p = Point(width_, height_);
+               Cursor old = cur;
+               bool const in_texted = cur.inTexted();
                cur.reset(buffer_.inset());
                updateMetrics();
                buffer_.changed();
                d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_);
                //FIXME: what to do with cur.x_target()?
+               bool update = in_texted && cur.bv().checkDepm(cur, old);
                cur.finishUndo();
+               if (update)
+                       processUpdateFlags(Update::Force | Update::FitCursor);
                break;
        }
 
@@ -1739,6 +1775,12 @@ void BufferView::lfunScroll(FuncRequest const & cmd)
 }
 
 
+int BufferView::minVisiblePart()
+{
+       return 2 * defaultRowHeight();
+}
+
+
 int BufferView::scroll(int y)
 {
        if (y > 0)
@@ -1753,10 +1795,12 @@ int BufferView::scrollDown(int offset)
 {
        Text * text = &buffer_.text();
        TextMetrics & tm = d->text_metrics_[text];
-       int ymax = height_ + offset;
+       int const ymax = height_ + offset;
        while (true) {
                pair<pit_type, ParagraphMetrics const *> last = tm.last();
                int bottom_pos = last.second->position() + last.second->descent();
+               if (lyxrc.scroll_below_document)
+                       bottom_pos += height_ - minVisiblePart();
                if (last.first + 1 == int(text->paragraphs().size())) {
                        if (bottom_pos <= height_)
                                return 0;