RMG: fix flicker UI logic of NetplaySessionBrowserWidget

Rosalie241 · Feb 9, 2025 · c046984 · c046984
1 parent 1ec02c5
commit c046984
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.cpp
@@ -229,11 +229,6 @@ void NetplaySessionBrowserDialog::on_webSocket_textMessageReceived(QString messa
 
             // we're done refreshing the sessions
             this->sessionBrowserWidget->RefreshDone();
-            // enable refresh button when refreshing is done
-            QPushButton* refreshButton = this->buttonBox->button(QDialogButtonBox::RestoreDefaults);
-            refreshButton->setEnabled(true);
-            // re-validate join button after refresh
-            this->validateJoinButton();
         }
         else
         {
@@ -332,6 +327,13 @@ void NetplaySessionBrowserDialog::on_sessionBrowserWidget_OnSessionChanged(bool
     this->validateJoinButton();
 }
 
+void NetplaySessionBrowserDialog::on_sessionBrowserWidget_OnRefreshDone(void)
+{
+    QPushButton* refreshButton = this->buttonBox->button(QDialogButtonBox::RestoreDefaults);
+    refreshButton->setEnabled(true);
+    this->validateJoinButton();
+}
+
 void NetplaySessionBrowserDialog::on_nickNameLineEdit_textChanged()
 {
     this->validateJoinButton();

diff --git a/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.hpp b/Source/RMG/UserInterface/Dialog/Netplay/NetplaySessionBrowserDialog.hpp
@@ -66,7 +66,8 @@ class NetplaySessionBrowserDialog : public QDialog, private Ui::NetplaySessionBr
 
     void on_serverComboBox_currentIndexChanged(int index);
     void on_sessionBrowserWidget_OnSessionChanged(bool valid);
-
+    void on_sessionBrowserWidget_OnRefreshDone(void);
+
     void on_nickNameLineEdit_textChanged(void);
 
     void on_buttonBox_clicked(QAbstractButton* button);

diff --git a/Source/RMG/UserInterface/Widget/Netplay/NetplaySessionBrowserWidget.cpp b/Source/RMG/UserInterface/Widget/Netplay/NetplaySessionBrowserWidget.cpp
@@ -126,20 +126,24 @@ void NetplaySessionBrowserWidget::RefreshDone(void)
 {
     if (this->tableWidget->rowCount() == 0)
     {
-        this->setCurrentWidget(this->emptyWidget);
-        return;
+        this->currentViewWidget = this->emptyWidget;
+    }
+    else
+    {
+        this->currentViewWidget = this->tableWidget;
     }
 
     // prevent flicker by forcing the loading screen
     // to be shown at least 300ms
     qint64 elapsedTime = this->refreshTimer.elapsed();
     if (elapsedTime < 300)
     {
-        this->startTimer(300 - elapsedTime);
+        this->showViewWidgetTimerId = this->startTimer(300 - elapsedTime);
         return;
     }
 
-    this->setCurrentWidget(this->tableWidget);
+    this->setCurrentWidget(this->currentViewWidget);
+    emit this->OnRefreshDone();
 }
 
 bool NetplaySessionBrowserWidget::IsCurrentSessionValid()
@@ -167,8 +171,14 @@ bool NetplaySessionBrowserWidget::GetCurrentSession(NetplaySessionData& data)
 
 void NetplaySessionBrowserWidget::timerEvent(QTimerEvent *event)
 {
-    this->killTimer(event->timerId());
-    this->setCurrentWidget(this->tableWidget);
+    if (event->timerId() == this->showViewWidgetTimerId)
+    {
+        this->killTimer(this->showViewWidgetTimerId);
+        this->showViewWidgetTimerId = -1;
+
+        this->setCurrentWidget(this->currentViewWidget);
+        emit this->OnRefreshDone();
+    }
 }
 
 void NetplaySessionBrowserWidget::on_tableWidget_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous)

diff --git a/Source/RMG/UserInterface/Widget/Netplay/NetplaySessionBrowserWidget.hpp b/Source/RMG/UserInterface/Widget/Netplay/NetplaySessionBrowserWidget.hpp
@@ -61,6 +61,7 @@ class NetplaySessionBrowserWidget : public QStackedWidget
     QTableWidget* tableWidget       = nullptr;
     QWidget*      currentViewWidget = nullptr;
 
+    int showViewWidgetTimerId = -1;
     QElapsedTimer refreshTimer;
 
   protected:
@@ -70,6 +71,7 @@ class NetplaySessionBrowserWidget : public QStackedWidget
     void on_tableWidget_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous);
 
   signals:
+    void OnRefreshDone(void);
     void OnSessionChanged(bool valid);
 
 };