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

🐛 Fix problem with images patterns repeating

Browse source
This commit is contained in:
alonso.torres 2023-07-06 11:41:05 +02:00
parent 647beec1e8
commit 7a499bfc90
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -46,6 +46,7 @@
- Makes height priority for the rows/columns grids [#2774](https://github.com/penpot/penpot/issues/2774) - Makes height priority for the rows/columns grids [#2774](https://github.com/penpot/penpot/issues/2774)
- Fix problem with comments mode not staying [#3363](https://github.com/penpot/penpot/issues/3363) - Fix problem with comments mode not staying [#3363](https://github.com/penpot/penpot/issues/3363)
- Fix problem with comments when user left the team [Taiga #5562](https://tree.taiga.io/project/penpot/issue/5562) - Fix problem with comments when user left the team [Taiga #5562](https://tree.taiga.io/project/penpot/issue/5562)
- Fix problem with images patterns repeating [#3372](https://github.com/penpot/penpot/issues/3372)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

19
frontend/src/app/main/ui/shapes/fills.cljs
View file

@ -16,6 +16,8 @@
[app.util.object :as obj] [app.util.object :as obj]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
(def no-repeat-padding 1.05)
(mf/defc fills (mf/defc fills
{::mf/wrap-props false} {::mf/wrap-props false}
[props] [props]
@ -71,7 +73,10 @@
(let [fill-id (dm/str "fill-" shape-index "-" render-id)] (let [fill-id (dm/str "fill-" shape-index "-" render-id)]
[:> :pattern (-> (obj/clone pattern-attrs) [:> :pattern (-> (obj/clone pattern-attrs)
(obj/set! "id" fill-id)) (obj/set! "id" fill-id)
(cond-> has-image?
(-> (obj/set! "width" (* width no-repeat-padding))
(obj/set! "height" (* height no-repeat-padding)))))
[:g [:g
(for [[fill-index value] (-> (d/enumerate (:fills shape [])) reverse)] (for [[fill-index value] (-> (d/enumerate (:fills shape [])) reverse)]
[:> :rect (-> (attrs/extract-fill-attrs value render-id fill-index type) [:> :rect (-> (attrs/extract-fill-attrs value render-id fill-index type)
@ -80,7 +85,17 @@
(obj/set! "height" height))]) (obj/set! "height" height))])
(when has-image? (when has-image?
[:g
;; We add this shape to add a padding so the patter won't repeat
;; Issue: https://tree.taiga.io/project/penpot/issue/5583
[:rect {:x 0
:y 0
:width (* width no-repeat-padding)
:height (* height no-repeat-padding)
:fill "none"}]
[:image {:href (or (:data-uri shape) (get embed uri uri)) [:image {:href (or (:data-uri shape) (get embed uri uri))
:preserveAspectRatio "none" :preserveAspectRatio "none"
:x 0
:y 0
:width width :width width
:height height}])]])]))))) :height height}]])]])])))))