From bc1d1b41c0c8c8718fb175790d458744a5c9fe42 Mon Sep 17 00:00:00 2001
From: Yihe Li <winmikedows@hotmail.com>
Date: Thu, 15 May 2025 19:12:15 +0800
Subject: [PATCH] Move menu creation to constructors to avoid performance
 issues

Signed-off-by: Yihe Li <winmikedows@hotmail.com>
---
 launcher/ui/pages/instance/ServersPage.cpp   | 42 ++++++++++----------
 launcher/ui/pages/instance/WorldListPage.cpp | 39 +++++++++---------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index b29cc1137..36844d92a 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -615,6 +615,26 @@ ServersPage::ServersPage(InstancePtr inst, QWidget* parent) : QMainWindow(parent
     connect(ui->resourceComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(resourceIndexChanged(int)));
     connect(m_model, &QAbstractItemModel::rowsRemoved, this, &ServersPage::rowsRemoved);
 
+    QList<QAction*> shortcutActions = { ui->actionCreateServerShortcutOther };
+    if (!DesktopServices::isFlatpak()) {
+        QString desktopDir = FS::getDesktopDir();
+        QString applicationDir = FS::getApplicationsDir();
+
+        if (!applicationDir.isEmpty())
+            shortcutActions.push_front(ui->actionCreateServerShortcutApplications);
+
+        if (!desktopDir.isEmpty())
+            shortcutActions.push_front(ui->actionCreateServerShortcutDesktop);
+    }
+
+    if (shortcutActions.length() > 1) {
+        auto shortcutInstanceMenu = new QMenu(this);
+
+        for (auto action : shortcutActions)
+            shortcutInstanceMenu->addAction(action);
+        ui->actionCreateServerShortcut->setMenu(shortcutInstanceMenu);
+    }
+
     m_locked = m_inst->isRunning();
     if (m_locked) {
         m_model->lock();
@@ -718,6 +738,7 @@ void ServersPage::updateState()
     ui->actionMove_Up->setEnabled(serverEditEnabled);
     ui->actionRemove->setEnabled(serverEditEnabled);
     ui->actionJoin->setEnabled(serverEditEnabled);
+    ui->actionCreateServerShortcut->setEnabled(serverEditEnabled);
 
     if (server) {
         ui->addressLine->setText(server->m_address);
@@ -730,27 +751,6 @@ void ServersPage::updateState()
     }
 
     ui->actionAdd->setDisabled(m_locked);
-
-    QList<QAction*> shortcutActions = { ui->actionCreateServerShortcutOther };
-    if (!DesktopServices::isFlatpak()) {
-        QString desktopDir = FS::getDesktopDir();
-        QString applicationDir = FS::getApplicationsDir();
-
-        if (!applicationDir.isEmpty())
-            shortcutActions.push_front(ui->actionCreateServerShortcutApplications);
-
-        if (!desktopDir.isEmpty())
-            shortcutActions.push_front(ui->actionCreateServerShortcutDesktop);
-    }
-
-    if (shortcutActions.length() > 1) {
-        auto shortcutInstanceMenu = new QMenu(this);
-
-        for (auto action : shortcutActions)
-            shortcutInstanceMenu->addAction(action);
-        ui->actionCreateServerShortcut->setMenu(shortcutInstanceMenu);
-    }
-    ui->actionCreateServerShortcut->setEnabled(serverEditEnabled);
 }
 
 void ServersPage::openedImpl()
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index f6a1e0e5f..c770f9f23 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -89,6 +89,26 @@ WorldListPage::WorldListPage(InstancePtr inst, std::shared_ptr<WorldList> worlds
 
     ui->toolBar->insertSpacer(ui->actionRefresh);
 
+    QList<QAction*> shortcutActions = { ui->actionCreateWorldShortcutOther };
+    if (!DesktopServices::isFlatpak()) {
+        QString desktopDir = FS::getDesktopDir();
+        QString applicationDir = FS::getApplicationsDir();
+
+        if (!applicationDir.isEmpty())
+            shortcutActions.push_front(ui->actionCreateWorldShortcutApplications);
+
+        if (!desktopDir.isEmpty())
+            shortcutActions.push_front(ui->actionCreateWorldShortcutDesktop);
+    }
+
+    if (shortcutActions.length() > 1) {
+        auto shortcutInstanceMenu = new QMenu(this);
+
+        for (auto action : shortcutActions)
+            shortcutInstanceMenu->addAction(action);
+        ui->actionCreateWorldShortcut->setMenu(shortcutInstanceMenu);
+    }
+
     WorldListProxyModel* proxy = new WorldListProxyModel(this);
     proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
     proxy->setSourceModel(m_worlds.get());
@@ -347,25 +367,6 @@ void WorldListPage::worldChanged([[maybe_unused]] const QModelIndex& current, [[
         ui->toolBar->removeAction(ui->actionJoin);
         ui->toolBar->removeAction(ui->actionCreateWorldShortcut);
     } else {
-        QList<QAction*> shortcutActions = { ui->actionCreateWorldShortcutOther };
-        if (!DesktopServices::isFlatpak()) {
-            QString desktopDir = FS::getDesktopDir();
-            QString applicationDir = FS::getApplicationsDir();
-
-            if (!applicationDir.isEmpty())
-                shortcutActions.push_front(ui->actionCreateWorldShortcutApplications);
-
-            if (!desktopDir.isEmpty())
-                shortcutActions.push_front(ui->actionCreateWorldShortcutDesktop);
-        }
-
-        if (shortcutActions.length() > 1) {
-            auto shortcutInstanceMenu = new QMenu(this);
-
-            for (auto action : shortcutActions)
-                shortcutInstanceMenu->addAction(action);
-            ui->actionCreateWorldShortcut->setMenu(shortcutInstanceMenu);
-        }
         ui->actionCreateWorldShortcut->setEnabled(enable);
     }
 }