remove another special case

SnosMe · Jan 11, 2025 · aecf7c5 · aecf7c5
1 parent 46403ef
commit aecf7c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/renderer/src/web/Config.ts b/renderer/src/web/Config.ts
@@ -413,6 +413,13 @@ function upgradeConfig (_config: Config): Config {
     const settings = config.widgets.find(w => w.wmType === 'settings') 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
@@ -79,10 +79,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')
-      ].filter(widget =>
+      return wm.widgets.value.filter(widget =>
         !widget.wmFlags.includes('menu::skip') &&
         (props.config.alwaysShow || (widget.wmWants === 'hide'))
       ).map((widget) => {