Fix bug #3038: wish for lfuns for zoom-in and zoom-out

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index f23704dbe459f94d39c2d728606a225c532dc4bb..c75b115fadc9891fb17f33d9d021fdec965c737c 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;
 }
 
 
@@ -800,11 +803,24 @@ void BufferView::showCursor()
 
 
 void BufferView::showCursor(DocIterator const & dit, bool recenter)
+{
+       if (scrollToCursor(dit, recenter))
+               buffer_.changed();
+}
+
+
+void BufferView::scrollToCursor()
+{
+       scrollToCursor(d->cursor_, false);
+}
+
+
+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!");
 
@@ -845,9 +861,9 @@ void BufferView::showCursor(DocIterator const & dit, bool recenter)
                // 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
@@ -875,7 +891,7 @@ void BufferView::showCursor(DocIterator const & dit, bool recenter)
                d->anchor_ypos_ = defaultRowHeight() * 2;
 
        updateMetrics();
-       buffer_.changed();
+       return true;
 }
 
 
@@ -937,12 +953,10 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_NEXT_INSET_TOGGLE: 
        case LFUN_NEXT_INSET_MODIFY: {
                // this is the real function we want to invoke
                FuncRequest tmpcmd = cmd;
-               tmpcmd.action = (cmd.action == LFUN_NEXT_INSET_TOGGLE) 
-                       ? LFUN_INSET_TOGGLE : LFUN_INSET_MODIFY;
+               tmpcmd.action = LFUN_INSET_MODIFY;
                // if there is an inset at cursor, see whether it
                // handles the lfun, other start from scratch
                Inset * inset = cur.nextInset();
@@ -1045,11 +1059,10 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 
        case LFUN_BRANCH_ACTIVATE: 
        case LFUN_BRANCH_DEACTIVATE: {
-               bool enable = false;
+               BranchList const & branchList = buffer_.params().branchlist();
                docstring const branchName = cmd.argument();
-               if (!branchName.empty())
-                       enable = buffer_.params().branchlist().find(branchName);
-               flag.setEnabled(enable);
+               flag.setEnabled(!branchName.empty()
+                               && branchList.find(branchName));
                break;
        }
 
@@ -1395,35 +1408,6 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                processUpdateFlags(Update::SinglePar | Update::FitCursor);
                break;
        }
-       case LFUN_NEXT_INSET_TOGGLE: {
-               // create the the real function we want to invoke
-               FuncRequest tmpcmd = cmd;
-               tmpcmd.action = LFUN_INSET_TOGGLE;
-               // if there is an inset at cursor, see whether it
-               // wants to toggle.
-               Inset * inset = cur.nextInset();
-               if (inset) {
-                       if (inset->isActive()) {
-                               Cursor tmpcur = cur;
-                               tmpcur.pushBackward(*inset);
-                               inset->dispatch(tmpcur, tmpcmd);
-                               if (tmpcur.result().dispatched())
-                                       cur.dispatched();
-                       } else 
-                               inset->dispatch(cur, tmpcmd);
-               }
-               // if it did not work, try the underlying inset.
-               if (!inset || !cur.result().dispatched())
-                       cur.dispatch(tmpcmd);
-
-               if (!cur.result().dispatched())
-                       // It did not work too; no action needed.
-                       break;
-               cur.clearSelection();
-               processUpdateFlags(Update::SinglePar | Update::FitCursor);
-               break;
-       }
-
        case LFUN_NEXT_INSET_MODIFY: {
                // create the the real function we want to invoke
                FuncRequest tmpcmd = cmd;
@@ -1517,6 +1501,8 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 
        case LFUN_BRANCH_ACTIVATE:
        case LFUN_BRANCH_DEACTIVATE:
+               if (cmd.argument().empty())
+                       return false;
                buffer_.dispatch(cmd);
                processUpdateFlags(Update::Force);
                break;
@@ -1759,6 +1745,12 @@ void BufferView::lfunScroll(FuncRequest const & cmd)
 }
 
 
+int BufferView::minVisiblePart()
+{
+       return 2 * defaultRowHeight();
+}
+
+
 int BufferView::scroll(int y)
 {
        if (y > 0)
@@ -1773,10 +1765,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;
@@ -2284,6 +2278,29 @@ bool BufferView::paragraphVisible(DocIterator const & dit) const
 }
 
 
+void BufferView::cursorPosAndHeight(Point & p, int & h) const
+{
+       Cursor const & cur = cursor();
+       Font const font = cur.getFont();
+       frontend::FontMetrics const & fm = theFontMetrics(font);
+       int const asc = fm.maxAscent();
+       int const des = fm.maxDescent();
+       h = asc + des;
+       p = getPos(cur, cur.boundary());
+       p.y_ -= asc;
+}
+
+
+bool BufferView::cursorInView(Point const & p, int h) const
+{
+       Cursor const & cur = cursor();
+       // does the cursor touch the screen ?
+       if (p.y_ + h < 0 || p.y_ >= workHeight() || !paragraphVisible(cur))
+               return false;
+       return true;
+}
+
+
 void BufferView::draw(frontend::Painter & pain)
 {
        if (height_ == 0 || width_ == 0)