@@ -11,7 +11,7 @@ import {
11
11
watchEffect ,
12
12
defineComponent ,
13
13
} from ' @vue/composition-api'
14
- import { SharedData } from ' @vue-devtools/shared-utils'
14
+ import { SharedData , isMac } from ' @vue-devtools/shared-utils'
15
15
import {
16
16
useLayers ,
17
17
useTime ,
@@ -1185,17 +1185,21 @@ export default defineComponent({
1185
1185
watch (startTime , () => queueCameraUpdate ())
1186
1186
watch (endTime , () => queueCameraUpdate ())
1187
1187
1188
+ let isShifPressed: boolean
1189
+
1188
1190
onMounted (() => {
1189
1191
queueCameraUpdate ()
1190
1192
// @ts-ignore
1191
1193
app .stage .addEventListener (' wheel' , onMouseWheel )
1192
1194
})
1193
1195
1194
1196
function onMouseWheel (event : FederatedWheelEvent ) {
1197
+ event .preventDefault ()
1198
+
1195
1199
const size = endTime .value - startTime .value
1196
1200
const viewWidth = getAppWidth ()
1197
1201
1198
- if (! event .ctrlKey && ! event .altKey ) {
1202
+ if (! event .ctrlKey && ! event .altKey && ! event . nativeEvent . shiftKey ) {
1199
1203
const centerRatio = event .globalX / viewWidth
1200
1204
const center = size * centerRatio + startTime .value
1201
1205
@@ -1217,10 +1221,13 @@ export default defineComponent({
1217
1221
} else {
1218
1222
let deltaX = event .deltaX
1219
1223
1220
- if (deltaX === 0 && event .shiftKey && event .deltaY !== 0 ) {
1224
+ if (deltaX === 0 && event .nativeEvent . shiftKey && event .deltaY !== 0 ) {
1221
1225
// Horitonzal scroll with vertical mouse wheel and shift key
1222
1226
deltaX = event .deltaY
1223
1227
}
1228
+ if (event .altKey ) {
1229
+ deltaX = 0
1230
+ }
1224
1231
1225
1232
if (deltaX !== 0 ) {
1226
1233
// Horizontal scroll
@@ -1237,7 +1244,7 @@ export default defineComponent({
1237
1244
// Vertical scroll
1238
1245
const layersScroller = document .querySelector (' [data-scroller="layers"]' )
1239
1246
if (layersScroller ) {
1240
- const speed = SharedData . menuStepScrolling ? 1 : LAYER_SIZE * 4
1247
+ const speed = isMac ? Math . abs ( event . deltaY ) : LAYER_SIZE * 4
1241
1248
if (event .deltaY < 0 ) {
1242
1249
layersScroller .scrollTop -= speed
1243
1250
} else {
0 commit comments