fixed wrong macro viibility filtering

HelgeKeck · Aug 5, 2024 · 1b37ec2 · 1b37ec2
1 parent e435d80
commit 1b37ec2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/components/widgets/macros/MacroBtn.vue b/src/components/widgets/macros/MacroBtn.vue
@@ -1,7 +1,7 @@
 <template>
   <app-btn-group divided>
     <app-btn
-      v-if="!(macro.hideWhilePrinting && printerPrinting) && !(macro.hideWhilePaused && printerPaused) && !(macro.hideWhileStandby && printerState === 'ready')"
+      v-if="!(macro.hideWhilePrinting && printerPrinting) && !(macro.hideWhilePaused && printerPaused) && !(macro.hideWhileStandby && (printerState === 'ready' || printerState === 'idle' || printerState === 'canceled'))"
       :disabled="(macro.disabledWhilePrinting && printerPrinting) || !klippyReady"
       :style="borderStyle"
       v-on="filteredListeners"

diff --git a/src/components/widgets/macros/Macros.vue b/src/components/widgets/macros/Macros.vue
@@ -10,7 +10,7 @@
         :key="`category-${category.id}`"
       >
         <v-expansion-panel-header
-          v-if="category.id === '0' || (!(category.hideWhilePrinting && printerPrinting) && !(category.hideWhilePaused && printerPaused) && !(category.hideWhileStandby && printerState === 'ready'))"
+          v-if="category.id === '0' || (!(category.hideWhilePrinting && printerPrinting) && !(category.hideWhilePaused && printerPaused) && !(category.hideWhileStandby && (printerState === 'ready' || printerState === 'idle' || printerState === 'canceled')))"
         >
           <template #actions>
             <v-icon
@@ -44,7 +44,7 @@
         </v-expansion-panel-header>
 
         <v-expansion-panel-content
-          v-if="category.id === '0' || (!(category.hideWhilePrinting && printerPrinting) && !(category.hideWhilePaused && printerPaused) && !(category.hideWhileStandby && printerState === 'ready'))"
+          v-if="category.id === '0' || (!(category.hideWhilePrinting && printerPrinting) && !(category.hideWhilePaused && printerPaused) && !(category.hideWhileStandby && (printerState === 'ready' || printerState === 'idle' || printerState === 'canceled')))"
         >
           <v-tooltip
             v-for="macro in category.macros"
@@ -54,7 +54,7 @@
           >
             <template #activator="{ on, attrs }">
               <macro-btn
-                v-if="!(macro.hideWhilePrinting && printerPrinting) && !(macro.hideWhilePaused && printerPaused) && !(macro.hideWhileStandby && printerState === 'ready')"
+                v-if="!(macro.hideWhilePrinting && printerPrinting) && !(macro.hideWhilePaused && printerPaused) && !(macro.hideWhileStandby && (printerState === 'ready' || printerState === 'idle' || printerState === 'canceled'))"
                 v-bind="attrs"
                 :macro="macro"
                 :category="category"

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -147,11 +147,11 @@ export default class Dashboard extends Mixins(StateMixin) {
       }
     }
     if (layoutIndex === -1) {
-      console.error('no new layouts found')
-      this.$store.dispatch('layout/onLayoutChange', {
-        name: 'dashboard',
-        value: defaultState().layouts.dashboard
-      })
+      // console.error('no new layouts found')
+      // this.$store.dispatch('layout/onLayoutChange', {
+      //   name: 'dashboard',
+      //   value: defaultState().layouts.dashboard
+      // })
       this.usedColumns = [1, 1, 1, 1, 1]
     }
   }