Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

Fix animations for icons and images.

Browse source
This commit is contained in:
Andrey Antukh 2016-11-09 12:37:52 +01:00
parent 71eb45ce2c
commit 6a0a71de5a
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
2 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/uxbox/main/ui/shapes/icon.cljs
View file

@ -29,7 +29,7 @@
(mx/defc icon-shape
{:mixins [mx/static]}
[{:keys [x1 y1 content id metadata] :as shape} factory]
(let [key (str "shape-icon-raw-" id)
(let [key (str "shape-" id)
;; rfm (geom/transformation-matrix shape)
view-box (apply str (interpose " " (:view-box metadata)))
size (geom/size shape)

46
src/uxbox/view/ui/viewer/interactions.cljs
View file

@ -112,49 +112,6 @@
:delay delay
:duration duration}))))
;; (defn- run-size-interaction
;; [{:keys [element resize-width resize-height
;; easing delay duration] :as opts}]
;; (let [shape (get-in @st/state [:shapes element])
;; tf (geom/transformation-matrix
;; (geom/resize shape (gpt/point resize-width resize-height)))]
;; (animate :targets [(str "#shape-" element)]
;; :transform (str tf)
;; :easing (translate-ease easing)
;; :delay delay
;; :duration duration
;; :loop false)))
(defn- run-size-interaction-icon
[{:keys [x1 y1 view-box rotation] :as shape}
{:keys [resize-width resize-height easing
element delay duration direction] :as opts}]
(if (= direction :reverse)
(let [end (geom/transformation-matrix shape)]
(animate :targets [(str "#shape-" element)]
:transform (str end)
:easing (translate-ease easing)
:delay delay
:duration duration
:loop false))
(let [orig-width (nth view-box 2)
orig-height (nth view-box 3)
scale-x (/ resize-width orig-width)
scale-y (/ resize-height orig-height)
center-x (- resize-width (/ resize-width 2))
center-y (- resize-height (/ resize-height 2))
end (-> (gmt/matrix)
(gmt/translate x1 y1)
(gmt/translate center-x center-y)
(gmt/rotate rotation)
(gmt/translate (- center-x) (- center-y))
(gmt/scale scale-x scale-y))
dom (dom/get-element (str "shape-" element))]
(animate* dom {:transform (str end)
:easing (translate-ease easing)
:delay delay
:duration duration}))))
(defn- run-size-interaction-rect
[{:keys [x1 y1 rotation] :as shape}
{:keys [resize-width resize-height easing
@ -178,7 +135,8 @@
[{:keys [element] :as opts}]
(let [shape (get-in @st/state [:shapes element])]
(case (:type shape)
:icon (run-size-interaction-icon shape opts)
:icon (run-size-interaction-rect shape opts)
:image (run-size-interaction-rect shape opts)
:rect (run-size-interaction-rect shape opts))))
(defn- run-gotourl-interaction