From ae01f87687cc28e9af8f0654f2af6708e869cf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 23 Aug 2026 02:24:34 +0200 Subject: [PATCH] Consolidate. Took 6 minutes --- cockatrice/src/client/latency_status_widget.cpp | 17 +++++++---------- cockatrice/src/client/latency_status_widget.h | 7 +++---- cockatrice/src/interface/window_main.cpp | 5 +---- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/cockatrice/src/client/latency_status_widget.cpp b/cockatrice/src/client/latency_status_widget.cpp index a8fc23ad5..779c726eb 100644 --- a/cockatrice/src/client/latency_status_widget.cpp +++ b/cockatrice/src/client/latency_status_widget.cpp @@ -35,8 +35,14 @@ LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent) hide(); } -void LatencyStatusWidget::updateStats(const LatencyTracker::Stats &stats) +void LatencyStatusWidget::updateData(const LatencyTracker::Stats &stats, const QList &samplesMs) { + latestSamples = samplesMs; + latencyGraph->setSamples(samplesMs); + if (popup && popup->isVisible() && detailGraph) { + detailGraph->setSamples(samplesMs); + } + if (stats.sampleCount == 0) { hide(); return; @@ -53,15 +59,6 @@ void LatencyStatusWidget::updateStats(const LatencyTracker::Stats &stats) show(); } -void LatencyStatusWidget::updateSamples(const QList &samplesMs) -{ - latestSamples = samplesMs; - latencyGraph->setSamples(samplesMs); - if (popup && popup->isVisible() && detailGraph) { - detailGraph->setSamples(samplesMs); - } -} - bool LatencyStatusWidget::eventFilter(QObject *watched, QEvent *event) { if ((watched == pingLabel || watched == latencyGraph) && event->type() == QEvent::MouseButtonPress) { diff --git a/cockatrice/src/client/latency_status_widget.h b/cockatrice/src/client/latency_status_widget.h index a3d591518..d9e1d130c 100644 --- a/cockatrice/src/client/latency_status_widget.h +++ b/cockatrice/src/client/latency_status_widget.h @@ -20,8 +20,8 @@ class LatencyGraphWidget; * sparkline of the rolling sample window. Clicking anywhere in the area opens * a popup with a larger graph and the numeric statistics. It closes on any * outside click. Stays hidden while disconnected or before any samples exist. - * Owns all latency display state so MainWindow only needs to forward two - * signals here. + * Owns all latency display state so MainWindow only needs to forward one + * signal here. */ class LatencyStatusWidget : public QWidget { @@ -30,8 +30,7 @@ public: explicit LatencyStatusWidget(QWidget *parent = nullptr); public slots: - void updateStats(const LatencyTracker::Stats &stats); - void updateSamples(const QList &samplesMs); + void updateData(const LatencyTracker::Stats &stats, const QList &samplesMs); protected: bool eventFilter(QObject *watched, QEvent *event) override; diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index c51dee97e..13c37473e 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -541,10 +541,7 @@ MainWindow::MainWindow(QWidget *parent) statusBar()->addPermanentWidget(latencyStatus); connect(connectionController, &ConnectionController::pingStatsUpdated, latencyStatus, - [this](const LatencyTracker::Stats &stats, const QList &samplesMs) { - latencyStatus->updateStats(stats); - latencyStatus->updateSamples(samplesMs); - }); + &LatencyStatusWidget::updateData); connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, &MainWindow::refreshShortcuts);