Skip to content

Commit 456a156

Browse files
authored
feat: lock dashboard sliders on mobile devices (#1614)
Signed-off-by: Pedro Lamas <[email protected]>
1 parent 6d2950d commit 456a156

File tree

7 files changed

+33
-42
lines changed

7 files changed

+33
-42
lines changed

src/components/ui/AppNamedSlider.vue

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,6 @@
3535
@keyup.enter.exact="handleSubmit(+currentValue)"
3636
>
3737
<template #prepend>
38-
<app-btn
39-
v-if="locked && isMobileViewport"
40-
icon
41-
small
42-
:disabled="disabled"
43-
style="margin-top: -4px;"
44-
@click="internalLocked = !internalLocked"
45-
>
46-
<v-icon
47-
v-if="internalLocked"
48-
small
49-
>
50-
$pencil
51-
</v-icon>
52-
<v-icon
53-
v-else
54-
small
55-
>
56-
$lockReset
57-
</v-icon>
58-
</app-btn>
59-
6038
<app-btn
6139
v-if="resetValue !== undefined"
6240
:disabled="disabled || loading"
@@ -85,20 +63,33 @@
8563
@start="handleStart"
8664
@end="handleEnd"
8765
@change="handleChange"
88-
/>
66+
>
67+
<template #prepend>
68+
<app-btn
69+
v-if="locked"
70+
icon
71+
small
72+
:disabled="disabled || loading || overridden"
73+
@click="internalLocked = !internalLocked"
74+
>
75+
<v-icon small>
76+
{{ internalLocked ? '$lock' : '$lockReset' }}
77+
</v-icon>
78+
</app-btn>
79+
</template>
80+
</v-slider>
8981
</v-form>
9082
</template>
9183

9284
<script lang="ts">
93-
import { Component, Prop, Watch, Ref, VModel, Mixins } from 'vue-property-decorator'
85+
import { Component, Prop, Watch, Ref, VModel, Vue } from 'vue-property-decorator'
9486
import type { InputValidationRules } from 'vuetify'
9587
import type { VForm } from '@/types'
96-
import BrowserMixin from '@/mixins/browser'
9788
9889
@Component({
9990
inheritAttrs: false
10091
})
101-
export default class AppNamedSlider extends Mixins(BrowserMixin) {
92+
export default class AppNamedSlider extends Vue {
10293
@VModel({ type: Number, required: true })
10394
inputValue!: number
10495

src/components/widgets/limits/PrinterLimits.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
:max="defaultVelocity"
1616
:disabled="!klippyReady"
1717
overridable
18-
:locked="isMobileViewport"
18+
:locked="isMobileUserAgent"
1919
:loading="hasWait($waits.onSetVelocity)"
2020
suffix="mm/s"
2121
@submit="setVelocity"
@@ -36,7 +36,7 @@
3636
:step="0.1"
3737
:disabled="!klippyReady"
3838
overridable
39-
:locked="isMobileViewport"
39+
:locked="isMobileUserAgent"
4040
:loading="hasWait($waits.onSetSquareCornerVelocity)"
4141
suffix="mm/s"
4242
@submit="setSquareCornerVelocity"
@@ -59,7 +59,7 @@
5959
:max="defaultAccel"
6060
:disabled="!klippyReady"
6161
overridable
62-
:locked="isMobileViewport"
62+
:locked="isMobileUserAgent"
6363
:loading="hasWait($waits.onSetAcceleration)"
6464
suffix="mm/s²"
6565
@submit="setAccel"
@@ -79,7 +79,7 @@
7979
:min="0"
8080
:max="99"
8181
:disabled="!klippyReady"
82-
:locked="isMobileViewport"
82+
:locked="isMobileUserAgent"
8383
:loading="hasWait($waits.onSetMinimumCruiseRatio)"
8484
suffix="%"
8585
@submit="setMinimumCruiseRatio"
@@ -94,7 +94,7 @@
9494
:max="defaultAccelToDecel"
9595
:disabled="!klippyReady"
9696
overridable
97-
:locked="isMobileViewport"
97+
:locked="isMobileUserAgent"
9898
:loading="hasWait($waits.onSetAccelToDecel)"
9999
suffix="mm/s²"
100100
@submit="setAccelToDecel"

src/components/widgets/outputs/OutputFan.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
customRules.minFan
1111
]"
1212
:disabled="!klippyReady"
13-
:locked="isMobileViewport"
13+
:locked="isMobileUserAgent"
1414
:loading="hasWait(`${$waits.onSetFanSpeed}${fan.name}`)"
1515
@submit="handleChange"
1616
/>

src/components/widgets/outputs/OutputPin.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:value="value"
1010
:reset-value="resetValue"
1111
:disabled="!klippyReady"
12-
:locked="isMobileViewport"
12+
:locked="isMobileUserAgent"
1313
:loading="hasWait(`${$waits.onSetOutputPin}${pin.name}`)"
1414
@submit="handleChange"
1515
/>

src/components/widgets/retract/Retract.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
:step="0.01"
1818
overridable
1919
:disabled="!klippyReady"
20-
:locked="isMobileViewport"
20+
:locked="isMobileUserAgent"
2121
:loading="hasWait($waits.onSetRetractLength)"
2222
@submit="setRetractLength"
2323
/>
@@ -38,7 +38,7 @@
3838
:step="0.01"
3939
overridable
4040
:disabled="!klippyReady"
41-
:locked="isMobileViewport"
41+
:locked="isMobileUserAgent"
4242
:loading="hasWait($waits.onSetUnretractExtraLength)"
4343
@submit="setUnRetractExtraLength"
4444
/>
@@ -62,7 +62,7 @@
6262
:max="maxRetractSpeed"
6363
overridable
6464
:disabled="!klippyReady"
65-
:locked="isMobileViewport"
65+
:locked="isMobileUserAgent"
6666
:loading="hasWait($waits.onSetRetractSpeed)"
6767
@submit="setRetractSpeed"
6868
/>
@@ -83,7 +83,7 @@
8383
:max="maxUnretractSpeed"
8484
overridable
8585
:disabled="!klippyReady"
86-
:locked="isMobileViewport"
86+
:locked="isMobileUserAgent"
8787
:loading="hasWait($waits.onSetUnretractSpeed)"
8888
@submit="setUnretractSpeed"
8989
/>
@@ -107,7 +107,7 @@
107107
:max="maxZHopHeight"
108108
overridable
109109
:disabled="!klippyReady"
110-
:locked="isMobileViewport"
110+
:locked="isMobileUserAgent"
111111
:loading="hasWait($waits.onSetZHopHeight)"
112112
@submit="setZHopHeight"
113113
/>

src/components/widgets/toolhead/PressureAdvanceAdjust.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
overridable
1212
:reset-value="selectedExtruderStepper?.config?.pressure_advance || 0"
1313
:disabled="!klippyReady"
14-
:locked="isMobileViewport"
14+
:locked="isMobileUserAgent"
1515
:loading="hasWait(`${$waits.onSetPressureAdvance}${extruderStepper?.name ?? ''}`)"
1616
:min="0"
1717
:max="2"
@@ -29,7 +29,7 @@
2929
:value="selectedExtruderStepper?.smooth_time || 0"
3030
:reset-value="selectedExtruderStepper?.config?.pressure_advance_smooth_time || 0"
3131
:disabled="!klippyReady"
32-
:locked="isMobileViewport"
32+
:locked="isMobileUserAgent"
3333
:loading="hasWait(`${$waits.onSetPressureAdvance}${extruderStepper?.name ?? ''}`)"
3434
:min="0"
3535
:max="0.2"

src/components/widgets/toolhead/SpeedAndFlowAdjust.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
:reset-value="100"
1313
:disabled="!klippyReady"
1414
:loading="hasWait($waits.onSetSpeed)"
15-
:locked="isMobileViewport"
15+
:locked="isMobileUserAgent"
1616
:min="1"
1717
:max="200"
1818
@submit="handleSetSpeed"
@@ -30,7 +30,7 @@
3030
:reset-value="100"
3131
:disabled="!klippyReady"
3232
:loading="hasWait($waits.onSetFlow)"
33-
:locked="isMobileViewport"
33+
:locked="isMobileUserAgent"
3434
:min="1"
3535
:max="200"
3636
@submit="handleSetFlow"

0 commit comments

Comments
 (0)