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

✨ Limit pasted object position to container boundaries

Browse source
This commit is contained in:
Alejandro Alonso 2022-01-14 16:22:10 +01:00 • committed by Andrés Moya
parent 6f5916e334
commit f754c12e8c
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -7,6 +7,7 @@
### :sparkles: New features
- Add an option to hide artboards names on the viewport [Taiga #2034](https://tree.taiga.io/project/penpot/issue/2034).
- Limit pasted object position to container boundaries [Taiga #2449](https://tree.taiga.io/project/penpot/us/2449).
- Add new options for zoom widget in workspace and viewer mode [Taiga #896](https://tree.taiga.io/project/penpot/us/896).
- Allow decimals on stroke width and positions [Taiga #2035](https://tree.taiga.io/project/penpot/issue/2035).
- Ability to ignore background when exporting an artboard [Taiga #1395](https://tree.taiga.io/project/penpot/us/1395).

31
frontend/src/app/main/data/workspace.cljs
View file

@ -1707,7 +1707,36 @@
(cond
(and (selected-frame? state) (not has-frame?))
(let [frame-id (first page-selected)
delta (get page-objects frame-id)]
frame-object (get page-objects frame-id)
origin-frame-id (:frame-id (first selected-objs))
origin-frame-object (get page-objects origin-frame-id)
;; - The pasted object position must be limited to container boundaries. If the pasted object doesn't fit we try to:
;; - Align it to the limits on the x and y axis
;; - Respect the distance of the object to the right and bottom in the original frame
margin-x (if origin-frame-object
(- (:width origin-frame-object) (+ (:x wrapper) (:width wrapper)))
0)
margin-x (min margin-x (- (:width frame-object) (:width wrapper)))
margin-y (if origin-frame-object
(- (:height origin-frame-object) (+ (:y wrapper) (:height wrapper)))
0)
margin-y (min margin-y (- (:height frame-object) (:height wrapper)))
;; Pasted objects mustn't exceed the selected frame x limit
paste-x (if (> (+ (:width wrapper) (:x1 wrapper)) (:width frame-object))
(+ (- (:x frame-object) (:x orig-pos)) (- (:width frame-object) (:width wrapper) margin-x))
(:x frame-object))
;; Pasted objects mustn't exceed the selected frame y limit
paste-y (if (> (+ (:height wrapper) (:y1 wrapper)) (:height frame-object))
(+ (- (:y frame-object) (:y orig-pos)) (- (:height frame-object) (:height wrapper) margin-y))
(:y frame-object))
delta (gpt/point paste-x paste-y)]
[frame-id frame-id delta])
(empty? page-selected)