Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-17 02:01:32 -05:00
Code Issues Activity

Make geom/size as shape transformation instead simple calculation.

Browse source
This commit is contained in:
Andrey Antukh 2016-12-20 16:57:01 +01:00
parent 0a5f4e310c
commit 8ca15771d5
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/uxbox/main/geom.cljs
View file

@ -12,6 +12,7 @@
;; --- Relative Movement ;; --- Relative Movement
;; TODO: revisit, maybe dead code
(declare move-rect) (declare move-rect)
(declare move-path) (declare move-path)
(declare move-circle) (declare move-circle)
@ -118,31 +119,47 @@
(declare size-rect) (declare size-rect)
(declare size-circle) (declare size-circle)
(declare size-path)
(defn size (defn size
"Calculate the size of the shape." "Calculate the size of the shape."
[shape] [shape]
(case (:type shape) (case (:type shape)
:group (assoc shape :width 100 :height 100)
:circle (size-circle shape) :circle (size-circle shape)
:text (size-rect shape) :text (size-rect shape)
:rect (size-rect shape) :rect (size-rect shape)
:icon (size-rect shape) :icon (size-rect shape)
:image (size-rect shape) :image (size-rect shape)
:path (size-rect shape))) :path (size-path shape)))
(defn- size-path
[{:keys [points x1 y1 x2 y2] :as shape}]
(if (and x1 y1 x2 y2)
(assoc shape
:width (- x2 x1)
:height (- y2 y1))
(let [minx (apply min (map :x points))
miny (apply min (map :y points))
maxx (apply max (map :x points))
maxy (apply max (map :y points))]
(assoc shape
:width (- maxx minx)
:height (- maxy miny)))))
(defn- size-rect (defn- size-rect
"A specialized function for calculate size "A specialized function for calculate size
for rect-like shapes." for rect-like shapes."
[{:keys [x1 y1 x2 y2] :as shape}] [{:keys [x1 y1 x2 y2] :as shape}]
{:width (- x2 x1) (merge shape {:width (- x2 x1)
:height (- y2 y1)}) :height (- y2 y1)}))
(defn- size-circle (defn- size-circle
"A specialized function for calculate size "A specialized function for calculate size
for circle shape." for circle shape."
[{:keys [rx ry]}] [{:keys [rx ry] :as shape}]
{:width (* rx 2) (merge shape {:width (* rx 2)
:height (* ry 2)}) :height (* ry 2)}))
;; --- Vertex Access ;; --- Vertex Access