Suppress scrollToBottom on CompileOutput after navigation

hicknhack-software · Jul 10, 2021 · ed599fd · ed599fd
1 parent aa62b39
commit ed599fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
@@ -163,7 +163,9 @@ OutputWindow::OutputWindow(Context context, const QString &settingsKey, QWidget
     d->scrollTimer.setInterval(10);
     d->scrollTimer.setSingleShot(true);
     connect(&d->scrollTimer, &QTimer::timeout,
-            this, &OutputWindow::scrollToBottom);
+            this, [&]() {
+        if (d->scrollToBottom) { scrollToBottom(); }
+    });
     d->lastMessage.start();
 
     d->originalFontSize = font().pointSizeF();
@@ -347,6 +349,11 @@ void OutputWindow::updateFilterProperties(
     filterNewContent();
 }
 
+void OutputWindow::disableScrollToBottom()
+{
+    d->scrollToBottom = false;
+}
+
 void OutputWindow::filterNewContent()
 {
     QTextBlock lastBlock = document()->findBlockByNumber(d->lastFilteredBlockNumber);

diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
@@ -84,6 +84,8 @@ class CORE_EXPORT OutputWindow : public QPlainTextEdit
             bool regexp,
             bool isInverted);
 
+    void disableScrollToBottom();
+
 signals:
     void wheelZoom();
 

diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -256,6 +256,7 @@ void CompileOutputWindow::goToNext()
     m_outputWindow->setTextCursor(cursor);
     cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
     m_outputWindow->setTextCursor(cursor);
+    m_outputWindow->disableScrollToBottom();
 }
 
 void CompileOutputWindow::goToPrev()
@@ -278,6 +279,7 @@ void CompileOutputWindow::goToPrev()
     m_outputWindow->setTextCursor(cursor);
     cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
     m_outputWindow->setTextCursor(cursor);
+    m_outputWindow->disableScrollToBottom();
 }
 
 bool CompileOutputWindow::canNavigate() const
@@ -329,6 +331,7 @@ void CompileOutputWindow::showPositionOf(const Task &task)
 
     // Center cursor now:
     m_outputWindow->centerCursor();
+    m_outputWindow->disableScrollToBottom();
 }
 
 void CompileOutputWindow::scrollToFirstTask()
@@ -342,6 +345,7 @@ void CompileOutputWindow::scrollToFirstTask()
     m_outputWindow->setTextCursor(cursor);
     cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
     m_outputWindow->setTextCursor(cursor);
+    m_outputWindow->disableScrollToBottom();
 }
 
 void CompileOutputWindow::flush()