Changeset 38813 in vbox

Timestamp:

Sep 21, 2011 12:28:27 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74108

Message:

VBoxDbgConsole: Fixed busted text handling wrt selections and cursor positioning.

Location:

trunk/src/VBox/Debugger

Files:

• VBoxDbgConsole.cpp (modified) (4 diffs)
• VBoxDbgConsole.h (modified) (1 diff)

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -94 +94 @@
 
 void
-VBoxDbgConsoleOutput::appendText(const QString &rStr)
+VBoxDbgConsoleOutput::appendText(const QString &rStr, bool fClearSelection)
 {
     Assert(m_hGUIThread == RTThreadNativeSelf());
@@ -102 +102 @@
 
     /*
-     * Insert all in one go and make sure it's visible.
+     * Insert all in one go and make sure it's visible. 
+     *  
+     * We need to move the cursor and unselect any selected text before 
+     * inserting anything, otherwise, text will disappear.
      */
     QTextCursor Cursor = textCursor();
-    if (!Cursor.atEnd())
-        moveCursor(QTextCursor::End); /* make sure we append the text */
-    Cursor.insertText(rStr);
-    ensureCursorVisible();
+    if (!fClearSelection && Cursor.hasSelection())
+    {
+        QTextCursor SavedCursor = Cursor;
+        Cursor.clearSelection();
+        Cursor.movePosition(QTextCursor::End);
+
+        Cursor.insertText(rStr);
+
+        setTextCursor(SavedCursor);
+    }
+    else
+    {
+        if (Cursor.hasSelection())
+            Cursor.clearSelection();
+        if (!Cursor.atEnd())
+            Cursor.movePosition(QTextCursor::End);
+
+        Cursor.insertText(rStr);
+
+        setTextCursor(Cursor);
+        ensureCursorVisible();
+    }
 }
 
@@ -381 +402 @@
     m_pszInputBuf[m_cbInputBuf++] = '\n';
 
-    m_pOutput->appendText(rCommand + "\n");
+    m_pOutput->appendText(rCommand + "\n", true /*fClearSelection*/);
     m_pOutput->ensureCursorVisible();
 
@@ -401 +422 @@
     if (m_cbOutputBuf)
     {
-        m_pOutput->appendText(QString::fromUtf8((const char *)m_pszOutputBuf, (int)m_cbOutputBuf));
+        m_pOutput->appendText(QString::fromUtf8((const char *)m_pszOutputBuf, (int)m_cbOutputBuf), false /*fClearSelection*/);
         m_cbOutputBuf = 0;
     }

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -54 +54 @@
      * unless the previous char was a newline ('\n').
      *
-     * @param   rStr        The text string to append.
-     */
-    virtual void appendText(const QString &rStr);
+     * @param   rStr        The text string to append. 
+     * @param   fClearSelection     Whether to clear selected text before appending. 
+     *                              If @c false the selection and window position
+     *                              are preserved.
+     */
+    virtual void appendText(const QString &rStr, bool fClearSelection);
 
 protected: