Replace the hardcoded TEXT_TO_INSET_OFFSET by tunable values

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index b960da639989f746a9b343d2a2b68229c94093e3..af0ad368b32d29188f56f3c5a03138b82d5b7e62 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -527,7 +527,13 @@ void BufferView::processUpdateFlags(Update::flags flags)
        // Then make sure that the screen contains the cursor if needed
        if (flags & Update::FitCursor) {
                if (needsFitCursor()) {
-                       scrollToCursor(d->cursor_, false);
+                       // First try to make the selection start visible
+                       // (which is just the cursor when there is no selection)
+                       scrollToCursor(d->cursor_.selectionBegin(), false);
+                       // Is the cursor visible? (only useful if cursor is at end of selection)
+                       if (needsFitCursor())
+                               // then try to make cursor visible instead
+                               scrollToCursor(d->cursor_, false);
                        // Metrics have to be recomputed (maybe again)
                        updateMetrics(flags);
                }
@@ -1533,12 +1539,18 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
        case LFUN_CHANGE_NEXT:
                findNextChange(this);
+               if (cur.inset().isTable())
+                       // In tables, there might be whole changed rows or columns
+                       cur.dispatch(cmd);
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                break;
 
        case LFUN_CHANGE_PREVIOUS:
                findPreviousChange(this);
+               if (cur.inset().isTable())
+                       // In tables, there might be whole changed rows or columns
+                       cur.dispatch(cmd);
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                break;
@@ -1551,32 +1563,43 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                }
                break;
 
-       case LFUN_ALL_CHANGES_ACCEPT:
+       case LFUN_ALL_CHANGES_ACCEPT: {
                // select complete document
                cur.reset();
                cur.selHandle(true);
                buffer_.text().cursorBottom(cur);
                // accept everything in a single step to support atomic undo
+               // temporarily disable track changes in order to end with really
+               // no new (e.g., DPSM-caused) changes (see #7487)
+               bool const track = buffer_.params().track_changes;
+               buffer_.params().track_changes = false;
                buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT);
+               buffer_.params().track_changes = track;
                cur.resetAnchor();
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                dr.forceBufferUpdate();
                break;
+       }
 
-       case LFUN_ALL_CHANGES_REJECT:
+       case LFUN_ALL_CHANGES_REJECT: {
                // select complete document
                cur.reset();
                cur.selHandle(true);
                buffer_.text().cursorBottom(cur);
                // reject everything in a single step to support atomic undo
-               // Note: reject does not work recursively; the user may have to repeat the operation
+               // temporarily disable track changes in order to end with really
+               // no new (e.g., DPSM-caused) changes (see #7487)
+               bool const track = buffer_.params().track_changes;
+               buffer_.params().track_changes = false;
                buffer_.text().acceptOrRejectChanges(cur, Text::REJECT);
+               buffer_.params().track_changes = track;
                cur.resetAnchor();
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                dr.forceBufferUpdate();
                break;
+       }
 
        case LFUN_WORD_FIND_FORWARD:
        case LFUN_WORD_FIND_BACKWARD: {
@@ -3185,7 +3208,6 @@ void BufferView::draw(frontend::Painter & pain, bool paint_caret)
                // however, the different coordinates of insets and paragraphs
                // needs to be updated.
                LYXERR(Debug::PAINTING, "Strategy: NoScreenUpdate");
-               pi.full_repaint = false;
                if (pain.isNull()) {
                        pi.full_repaint = true;
                        tm.draw(pi, 0, y);