Allow toggling (no)limits only after mathop symbol

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index ed559b152493c06b08b944bd68c11201ebce3d4f..7bdf9f38076a9e14f2a107432f29f9b9e3217ce6 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -477,7 +477,8 @@ string flagsAsString(Update::flags flags)
        return string((flags & Update::FitCursor) ? "FitCursor " : "")
                + ((flags & Update::Force) ? "Force " : "")
                + ((flags & Update::ForceDraw) ? "ForceDraw " : "")
-               + ((flags & Update::SinglePar) ? "SinglePar " : "");
+               + ((flags & Update::SinglePar) ? "SinglePar " : "")
+               + ((flags & Update::Decoration) ? "Decoration " : "");
 }
 
 }
@@ -503,6 +504,16 @@ void BufferView::processUpdateFlags(Update::flags flags)
                updateMetrics(flags);
        }
 
+       // Detect whether we can only repaint a single paragraph.
+       // We handle this before FitCursor because the later will require
+       // correct metrics at cursor position.
+       if (!(flags & Update::ForceDraw)) {
+               if (singleParUpdate())
+                       flags = flags | Update::SinglePar;
+               else
+                       updateMetrics(flags);
+       }
+
        // Then make sure that the screen contains the cursor if needed
        if (flags & Update::FitCursor) {
                if (needsFitCursor()) {
@@ -513,14 +524,6 @@ void BufferView::processUpdateFlags(Update::flags flags)
                flags = flags & ~Update::FitCursor;
        }
 
-       // Finally detect whether we can only repaint a single paragraph
-       if (!(flags & Update::ForceDraw)) {
-               if (singleParUpdate())
-                       flags = flags | Update::SinglePar;
-               else
-                       updateMetrics(flags);
-       }
-
        // Add flags to the the update flags. These will be reset to None
        // after the redraw is actually done
        d->update_flags_ = d->update_flags_ | flags;
@@ -1154,7 +1157,7 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                break;
 
        case LFUN_GRAPHICS_UNIFY:
-               flag.setEnabled(cur.selection());
+               flag.setEnabled(cur.countInsetsInSelection(GRAPHICS_CODE)>1);
                break;
 
        case LFUN_WORD_FINDADV: {
@@ -1392,14 +1395,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                // We need to find out if the bibliography information
                // has changed. See bug #11055.
                // So these should not be references...
-               LayoutModuleList const engines = buffer().params().citeEngine();
+               string const engine = buffer().params().citeEngine();
                CiteEngineType const enginetype = buffer().params().citeEngineType();
-               if (!cur.textUndo())
+               if (!cur.undoAction())
                        dr.setMessage(_("No further undo information"));
                else {
                        dr.screenUpdate(Update::Force | Update::FitCursor);
                        dr.forceBufferUpdate();
-                       if (buffer().params().citeEngine() != engines ||
+                       if (buffer().params().citeEngine() != engine ||
                            buffer().params().citeEngineType() != enginetype)
                                buffer().invalidateCiteLabels();
                }
@@ -1412,14 +1415,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                // We need to find out if the bibliography information
                // has changed. See bug #11055.
                // So these should not be references...
-               LayoutModuleList const engines = buffer().params().citeEngine();
+               string const engine = buffer().params().citeEngine();
                CiteEngineType const enginetype = buffer().params().citeEngineType();
-               if (!cur.textRedo())
+               if (!cur.redoAction())
                        dr.setMessage(_("No further redo information"));
                else {
                        dr.screenUpdate(Update::Force | Update::FitCursor);
                        dr.forceBufferUpdate();
-                       if (buffer().params().citeEngine() != engines ||
+                       if (buffer().params().citeEngine() != engine ||
                            buffer().params().citeEngineType() != enginetype)
                                buffer().invalidateCiteLabels();
                }