From 03a094d927315fc9f7a9ba7efb67a2daf4f0b038 Mon Sep 17 00:00:00 2001
From: Alexander Drozdov <snosme@gmail.com>
Date: Sat, 11 Jan 2025 13:38:20 +0200
Subject: [PATCH] remove another special case

---
 renderer/src/web/Config.ts              | 7 +++++++
 renderer/src/web/overlay/WidgetMenu.vue | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/renderer/src/web/Config.ts b/renderer/src/web/Config.ts
index 3c03d769..bc52c894 100644
--- a/renderer/src/web/Config.ts
+++ b/renderer/src/web/Config.ts
@@ -530,6 +530,13 @@ function upgradeConfig(_config: Config): Config {
     ) as widget.Widget;
     settings.wmTitle = "{icon=fa-cog}";
 
+    // make sure icon for settings comes first in the widget menu
+    config.widgets.sort((a, b) => {
+      if (a.wmType === "settings") return -1;
+      if (b.wmType === "settings") return 1;
+      return 0;
+    });
+
     config.configVersion = 17;
   }
 
diff --git a/renderer/src/web/overlay/WidgetMenu.vue b/renderer/src/web/overlay/WidgetMenu.vue
index 1c1e5dfb..6d6a6589 100644
--- a/renderer/src/web/overlay/WidgetMenu.vue
+++ b/renderer/src/web/overlay/WidgetMenu.vue
@@ -129,10 +129,7 @@ export default defineComponent({
     const wm = inject<WidgetManager>("wm")!;
 
     const widgets = computed(() => {
-      return [
-        wm.widgets.value.find((widget) => widget.wmType === "settings")!,
-        ...wm.widgets.value.filter((widget) => widget.wmType !== "settings"),
-      ]
+      return wm.widgets.value
         .filter(
           (widget) =>
             !widget.wmFlags.includes("menu::skip") &&