feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core::OutputWindow: Pimpl remaining members

Browse Source 
Apparently, these were forgotten when the d-pointer was added.

Change-Id: I508074361ee3fb1d07a49c883669e96649561a51
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-04-29 13:57:05 +02:00
parent a6e1894274
commit 6d36db78aa
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -36,11 +36,13 @@
#include <QAction> #include <QAction>
#include <QCursor> #include <QCursor>
#include <QElapsedTimer>
#include <QMimeData> #include <QMimeData>
#include <QPointer> #include <QPointer>
#include <QRegularExpression> #include <QRegularExpression>
#include <QScrollBar> #include <QScrollBar>
#include <QTextBlock> #include <QTextBlock>
#include <QTimer>
#ifdef WITH_TESTS #ifdef WITH_TESTS
#include <QtTest> #include <QtTest>
@@ -89,6 +91,8 @@ public:
int lastFilteredBlockNumber = -1; int lastFilteredBlockNumber = -1;
QPalette originalPalette; QPalette originalPalette;
OutputWindow::FilterModeFlags filterMode = OutputWindow::FilterModeFlag::Default; OutputWindow::FilterModeFlags filterMode = OutputWindow::FilterModeFlag::Default;
QTimer scrollTimer;
QElapsedTimer lastMessage;
}; };
} // namespace Internal } // namespace Internal
@@ -161,11 +165,11 @@ OutputWindow::OutputWindow(Context context, const QString &settingsKey, QWidget
cutAction->setEnabled(false); cutAction->setEnabled(false);
copyAction->setEnabled(false); copyAction->setEnabled(false);
m_scrollTimer.setInterval(10); d->scrollTimer.setInterval(10);
m_scrollTimer.setSingleShot(true); d->scrollTimer.setSingleShot(true);
connect(&m_scrollTimer, &QTimer::timeout, connect(&d->scrollTimer, &QTimer::timeout,
this, &OutputWindow::scrollToBottom); this, &OutputWindow::scrollToBottom);
m_lastMessage.start(); d->lastMessage.start();
d->originalFontSize = font().pointSizeF(); d->originalFontSize = font().pointSizeF();
@@ -426,20 +430,20 @@ void OutputWindow::handleOutputChunk(const QString &output, OutputFormat format)
} }
} }
const bool atBottom = isScrollbarAtBottom() || m_scrollTimer.isActive(); const bool atBottom = isScrollbarAtBottom() || d->scrollTimer.isActive();
d->scrollToBottom = true; d->scrollToBottom = true;
d->formatter.appendMessage(out, format); d->formatter.appendMessage(out, format);
if (atBottom) { if (atBottom) {
if (m_lastMessage.elapsed() < 5) { if (d->lastMessage.elapsed() < 5) {
m_scrollTimer.start(); d->scrollTimer.start();
} else { } else {
m_scrollTimer.stop(); d->scrollTimer.stop();
scrollToBottom(); scrollToBottom();
} }
} }
m_lastMessage.start(); d->lastMessage.start();
enableUndoRedo(); enableUndoRedo();
} }

4
src/plugins/coreplugin/outputwindow.h
View File

@@ -30,9 +30,7 @@
#include <utils/outputformat.h> #include <utils/outputformat.h>
#include <QElapsedTimer>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QTimer>
namespace Utils { namespace Utils {
class OutputFormatter; class OutputFormatter;
@@ -106,8 +104,6 @@ private:
void wheelEvent(QWheelEvent *e) override; void wheelEvent(QWheelEvent *e) override;
using QPlainTextEdit::setFont; // call setBaseFont instead, which respects the zoom factor using QPlainTextEdit::setFont; // call setBaseFont instead, which respects the zoom factor
QTimer m_scrollTimer;
QElapsedTimer m_lastMessage;
void enableUndoRedo(); void enableUndoRedo();
void filterNewContent(); void filterNewContent();
void handleNextOutputChunk(); void handleNextOutputChunk();

1
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -60,6 +60,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QTabBar> #include <QTabBar>
#include <QTabWidget> #include <QTabWidget>
#include <QTimer>
#include <QToolButton> #include <QToolButton>
#include <QVBoxLayout> #include <QVBoxLayout>