Skip to content

Commit 500caeb

Browse files
committed
fix: jog button order and spaces
1 parent bc7ba42 commit 500caeb

File tree

1 file changed

+66
-10
lines changed

1 file changed

+66
-10
lines changed

src/components/panels/CNCMovementPanel.vue

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<v-row v-for="(axis, axisIndex) in visibleAxes" :key="axisIndex" dense>
4444
<!-- Regular home buttons -->
45-
<v-col cols="2" order="1" sm="4" md="1" order-md="1">
45+
<v-col cols="4" order="1" sm="4" md="1" order-md="1">
4646
<v-row dense>
4747
<v-col>
4848
<code-btn color="warning" tile block :code="`G10 L20 P${currentWorkplace} ${axis.letter}0`"
@@ -51,38 +51,93 @@
5151
</code-btn>
5252
</v-col>
5353
</v-row>
54+
<v-divider class="my-4 d-md-none" />
5455
</v-col>
5556

5657
<!-- Decreasing movements -->
5758
<v-col cols="6" order="3" md="5" order-md="2">
5859
<v-row dense>
59-
<v-col v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(index - 1)">
60-
<code-btn :code="getMoveCode(axis, index - 1, true)" no-wait
61-
@contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)" block tile
62-
class="move-btn">
60+
<v-col
61+
v-for="index in numMoveSteps"
62+
:key="index"
63+
:class="[
64+
getMoveCellClass(index - 1),
65+
(index === numMoveSteps ? 'd-none d-md-flex' : '')
66+
]"
67+
>
68+
<code-btn
69+
:code="getMoveCode(axis, index - 1, true)"
70+
no-wait
71+
@contextmenu.prevent="showMoveStepDialog(axis.letter, index - 1)"
72+
block
73+
tile
74+
class="move-btn"
75+
>
6376
<v-icon>mdi-chevron-left</v-icon>
6477
{{ axis.letter + showSign(-moveSteps(axis.letter)[index - 1]) }}
6578
</code-btn>
6679
</v-col>
6780
</v-row>
81+
<v-row dense class="d-md-none">
82+
<v-col v-if="numMoveSteps > 0" :class="getMoveCellClass(numMoveSteps - 1)">
83+
<code-btn
84+
:code="getMoveCode(axis, numMoveSteps - 1, true)"
85+
no-wait
86+
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - 1)"
87+
block
88+
tile
89+
class="move-btn"
90+
>
91+
<v-icon>mdi-chevron-left</v-icon>
92+
{{ axis.letter + showSign(-moveSteps(axis.letter)[numMoveSteps - 1]) }}
93+
</code-btn>
94+
</v-col>
95+
</v-row>
6896
</v-col>
6997

7098
<!-- Increasing movements -->
7199
<v-col cols="6" order="4" md="5" order-md="3">
72100
<v-row dense>
73-
<v-col v-for="index in numMoveSteps" :key="index" :class="getMoveCellClass(numMoveSteps - index)">
74-
<code-btn :code="getMoveCode(axis, numMoveSteps - index, false)" no-wait
75-
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)" block
76-
tile class="move-btn">
101+
<v-col
102+
v-for="index in numMoveSteps"
103+
:key="index"
104+
:class="[
105+
getMoveCellClass(numMoveSteps - index),
106+
(index === 1 ? 'd-none d-md-flex' : '')
107+
]"
108+
>
109+
<code-btn
110+
:code="getMoveCode(axis, numMoveSteps - index, false)"
111+
no-wait
112+
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - index)"
113+
block
114+
tile
115+
class="move-btn"
116+
>
77117
{{ axis.letter + showSign(moveSteps(axis.letter)[numMoveSteps - index]) }}
78118
<v-icon>mdi-chevron-right</v-icon>
79119
</code-btn>
80120
</v-col>
81121
</v-row>
122+
<v-row dense class="d-md-none">
123+
<v-col v-if="numMoveSteps > 0" :class="getMoveCellClass(numMoveSteps - 1)">
124+
<code-btn
125+
:code="getMoveCode(axis, numMoveSteps - 1, false)"
126+
no-wait
127+
@contextmenu.prevent="showMoveStepDialog(axis.letter, numMoveSteps - 1)"
128+
block
129+
tile
130+
class="move-btn"
131+
>
132+
{{ axis.letter + showSign(moveSteps(axis.letter)[numMoveSteps - 1]) }}
133+
<v-icon>mdi-chevron-right</v-icon>
134+
</code-btn>
135+
</v-col>
136+
</v-row>
82137
</v-col>
83138

84139
<!-- Set axis-->
85-
<v-col cols="2" order="2" offset="8" sm="4" offset-sm="4" md="1" order-md="4" offset-md="0">
140+
<v-col cols="4" order="2" offset="4" sm="4" offset-sm="4" md="1" order-md="4" offset-md="0">
86141
<v-row dense>
87142
<v-col>
88143
<code-btn tile block :color="axis.homed ? 'primary' : 'warning'" :disabled="uiFrozen"
@@ -92,6 +147,7 @@
92147
</code-btn>
93148
</v-col>
94149
</v-row>
150+
<v-divider class="my-4 d-md-none" />
95151
</v-col>
96152
<v-col cols="12" class="d-md-none">
97153
<v-divider class="my-4" />

0 commit comments

Comments
 (0)