Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-14 08:41:48 -05:00
Code Issues Activity

Fix inconsistent behavior of magnet flag.

Browse source
This commit is contained in:
Andrey Antukh 2017-03-21 20:41:43 +01:00
parent d808ca2a87
commit 7958c33e34
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/uxbox/main/data/shapes.cljs
View file

@ -725,11 +725,6 @@
;; --- Move Selected ;; --- Move Selected
(defn- alignment-activated?
[state]
(let [flags (l/focus ul/workspace-flags state)]
(refs/alignment-activated? flags)))
(defn- get-displacement (defn- get-displacement
"Retrieve the correct displacement delta point for the "Retrieve the correct displacement delta point for the
provided direction speed and distances thresholds." provided direction speed and distances thresholds."
@ -759,9 +754,8 @@
(deftype MoveSelected [direction speed] (deftype MoveSelected [direction speed]
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(let [align? (alignment-activated? state) (let [{:keys [page selected]} (:workspace state)
selected (l/focus ul/selected-shapes state) align? (refs/alignment-activated? state)
page (l/focus ul/selected-page state)
metadata (merge c/page-metadata (get-in state [:pages page :metadata])) metadata (merge c/page-metadata (get-in state [:pages page :metadata]))
distance (get-displacement-distance metadata align?) distance (get-displacement-distance metadata align?)
displacement (get-displacement direction speed distance)] displacement (get-displacement direction speed distance)]

13
frontend/src/uxbox/main/refs.cljs
View file

@ -8,6 +8,7 @@
"A collection of derived refs." "A collection of derived refs."
(:require [lentes.core :as l] (:require [lentes.core :as l]
[beicon.core :as rx] [beicon.core :as rx]
[uxbox.main.constants :as c]
[uxbox.main.store :as st] [uxbox.main.store :as st]
[uxbox.main.lenses :as ul])) [uxbox.main.lenses :as ul]))
@ -101,14 +102,16 @@
(l/derive workspace))) (l/derive workspace)))
(defn alignment-activated? (defn alignment-activated?
[flags] [state]
(and (contains? flags :grid-indexed) (let [{:keys [page flags]} (:workspace state)
(contains? flags :grid-alignment) metadata (merge c/page-metadata (get-in state [:pages page :metadata]))]
(contains? flags :grid))) (and (contains? flags :grid-indexed)
(contains? flags :grid)
(:grid-alignment metadata))))
(def selected-alignment (def selected-alignment
(-> (l/lens alignment-activated?) (-> (l/lens alignment-activated?)
(l/derive flags))) (l/derive st/state)))
(def canvas-mouse-position (def canvas-mouse-position
(-> (l/in [:pointer :canvas]) (-> (l/in [:pointer :canvas])