Fix the tab ordering of GuiDocument components.

[lyx.git] / src / frontends / qt4 / GuiCompleter.cpp

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index dfd15a941943a60bd2678718be76ccd1f07a4b73..da2d688c59688e90892a7ef407a5928f6cb83542 100644 (file)
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -162,7 +162,7 @@ GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent)
        model_ = new GuiCompletionModel(this, 0);
        setModel(model_);
        setCompletionMode(QCompleter::PopupCompletion);
-       setCaseSensitivity(Qt::CaseInsensitive);
+       setCaseSensitivity(Qt::CaseSensitive);
        setWidget(gui_);
        
        // create the popup
@@ -311,7 +311,7 @@ void GuiCompleter::updateVisibility(Cursor & cur, bool start, bool keep, bool cu
        if (!inlineVisible() && possibleInlineState && start
                && cur.inset().automaticInlineCompletion())
                inline_timer_.start(int(lyxrc.completion_inline_delay * 1000));
-       else {
+       else if (cur.inMathed() && !lyxrc.completion_inline_math) {
                // no inline completion, hence a metrics update is needed
                if (!(cur.result().screenUpdate() & Update::Force))
                        cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
@@ -683,6 +683,7 @@ void GuiCompleter::tab()
        }
        
        // Make undo possible
+       cur.beginUndoGroup();
        cur.recordUndo();
 
        // If completion is active, at least complete by one character
@@ -696,11 +697,14 @@ void GuiCompleter::tab()
                hidePopup(cur);
                hideInline(cur);
                updateVisibility(false, false);
+               cur.endUndoGroup();
                return;
        }
        docstring nextchar = completion.substr(prefix.size(), 1);
-       if (!cur.inset().insertCompletion(cur, nextchar, false))
+       if (!cur.inset().insertCompletion(cur, nextchar, false)) {
+               cur.endUndoGroup();
                return;
+       }
        updatePrefix(cur);
 
        // try to complete as far as it is unique
@@ -720,6 +724,7 @@ void GuiCompleter::tab()
        // redraw if needed
        if (cur.result().screenUpdate())
                gui_->bufferView().processUpdateFlags(cur.result().screenUpdate());
+       cur.endUndoGroup();
 }
 
 
@@ -875,7 +880,8 @@ void GuiCompleter::popupActivated(const QString & completion)
 {
        Cursor cur = gui_->bufferView().cursor();
        cur.screenUpdateFlags(Update::None);
-       
+
+       cur.beginUndoGroup();
        cur.recordUndo();
 
        docstring prefix = cur.inset().completionPrefix(cur);
@@ -886,6 +892,7 @@ void GuiCompleter::popupActivated(const QString & completion)
        
        if (cur.result().screenUpdate())
                gui_->bufferView().processUpdateFlags(cur.result().screenUpdate());
+       cur.endUndoGroup();
 }