3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-23 05:06:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fixes issues with horizontal scroll with trackpad

Browse source
This commit is contained in:
alonso.torres 2021-01-14 11:48:32 +01:00
parent 356572c21b
commit 3b6c9f9511
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/app/main/ui/handoff.cljs
View file

@ -77,8 +77,10 @@
(fn [event] (fn [event]
(when (kbd/ctrl? event) (when (kbd/ctrl? event)
(dom/prevent-default event) (dom/prevent-default event)
(let [event (.getBrowserEvent ^js event)] (let [event (.getBrowserEvent ^js event)
(if (pos? (.-deltaY ^js event)) delta (+ (.-deltaY ^js event)
(.-deltaX ^js event))]
(if (pos? delta)
(st/emit! dv/decrease-zoom) (st/emit! dv/decrease-zoom)
(st/emit! dv/increase-zoom)))))) (st/emit! dv/increase-zoom))))))

5
frontend/src/app/main/ui/viewer.cljs
View file

@ -215,8 +215,9 @@
(fn [event] (fn [event]
(when (kbd/ctrl? event) (when (kbd/ctrl? event)
(dom/prevent-default event) (dom/prevent-default event)
(let [event (.getBrowserEvent ^js event)] (let [event (.getBrowserEvent ^js event)
(if (pos? (.-deltaY ^js event)) delta (+ (.-deltaY ^js event) (.-deltaX ^js event))]
(if (pos? delta)
(st/emit! dv/decrease-zoom) (st/emit! dv/decrease-zoom)
(st/emit! dv/increase-zoom))))) (st/emit! dv/increase-zoom)))))

5
frontend/src/app/main/ui/workspace/colorpalette.cljs
View file

@ -103,9 +103,10 @@
(mf/use-callback (mf/use-callback
(mf/deps max-offset) (mf/deps max-offset)
(fn [event] (fn [event]
(if (pos? (.. event -nativeEvent -deltaY)) (let [delta (+ (.. event -nativeEvent -deltaY) (.. event -nativeEvent -deltaX))]
(if (pos? delta)
(on-right-arrow-click event) (on-right-arrow-click event)
(on-left-arrow-click event)))) (on-left-arrow-click event)))))
on-resize on-resize
(mf/use-callback (mf/use-callback

19
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -427,9 +427,11 @@
pos @ms/mouse-position] pos @ms/mouse-position]
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(if (pos? (.-deltaY event)) (let [delta (+ (.-deltaY ^js event)
(.-deltaX ^js event))]
(if (pos? delta)
(st/emit! (dw/decrease-zoom pos)) (st/emit! (dw/decrease-zoom pos))
(st/emit! (dw/increase-zoom pos)))) (st/emit! (dw/increase-zoom pos)))))
(.contains ^js node target) (.contains ^js node target)
(let [event (.getBrowserEvent ^js event) (let [event (.getBrowserEvent ^js event)
@ -440,13 +442,18 @@
(= delta-mode WheelEvent.DeltaMode.LINE) 16 (= delta-mode WheelEvent.DeltaMode.LINE) 16
(= delta-mode WheelEvent.DeltaMode.PAGE) 100) (= delta-mode WheelEvent.DeltaMode.PAGE) 100)
delta (* (.-deltaY ^js event) unit) delta-y (-> (.-deltaY ^js event)
delta (/ delta @refs/selected-zoom)] (* unit)
(/ @refs/selected-zoom))
delta-x (-> (.-deltaX ^js event)
(* unit)
(/ @refs/selected-zoom))]
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(if (kbd/shift? event) (if (kbd/shift? event)
(st/emit! (dw/update-viewport-position {:x #(+ % delta)})) (st/emit! (dw/update-viewport-position {:x #(+ % delta-y)}))
(st/emit! (dw/update-viewport-position {:y #(+ % delta)})))))))) (st/emit! (dw/update-viewport-position {:x #(+ % delta-x)
:y #(+ % delta-y)}))))))))
on-drag-enter on-drag-enter
(mf/use-callback (mf/use-callback