forked from qt-creator/qt-creator
Terminal: Replace QElapsedTimer with QDeadlineTimer
The QElapsedTimer::durationElapsed() was introduced in Qt 6.6. Use QDeadlineTimer instead. Change-Id: I5d9a797fd7e9ff6563e3820e2ee09ecae90b03e5 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
committed by
Marcus Tillmanns
parent
191c6603da
commit
0fd3f5a047
@@ -11,7 +11,7 @@
|
|||||||
#include <QCache>
|
#include <QCache>
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QElapsedTimer>
|
#include <QDeadlineTimer>
|
||||||
#include <QGlyphRun>
|
#include <QGlyphRun>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
@@ -78,7 +78,7 @@ public:
|
|||||||
|
|
||||||
QTimer m_updateTimer;
|
QTimer m_updateTimer;
|
||||||
std::optional<QRegion> m_updateRegion;
|
std::optional<QRegion> m_updateRegion;
|
||||||
QElapsedTimer m_sinceLastPaint;
|
QDeadlineTimer m_sinceLastPaint;
|
||||||
|
|
||||||
QTimer m_scrollTimer;
|
QTimer m_scrollTimer;
|
||||||
int m_scrollDirection{0};
|
int m_scrollDirection{0};
|
||||||
@@ -929,7 +929,7 @@ void TerminalView::paintEvent(QPaintEvent *event)
|
|||||||
QString("Paint: %1ms").arg(t.elapsed()));
|
QString("Paint: %1ms").arg(t.elapsed()));
|
||||||
}
|
}
|
||||||
|
|
||||||
d->m_sinceLastPaint.start();
|
d->m_sinceLastPaint = QDeadlineTimer(minRefreshInterval);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TerminalView::keyPressEvent(QKeyEvent *event)
|
void TerminalView::keyPressEvent(QKeyEvent *event)
|
||||||
@@ -1055,7 +1055,7 @@ void TerminalView::updateViewportRect(const QRect &rect)
|
|||||||
if (d->m_updateTimer.isActive())
|
if (d->m_updateTimer.isActive())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (d->m_sinceLastPaint.durationElapsed() < minRefreshInterval) {
|
if (!d->m_sinceLastPaint.hasExpired()) {
|
||||||
d->m_updateTimer.start();
|
d->m_updateTimer.start();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user