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

🐛 Fix stroke cut on shapes export

Browse source
This commit is contained in:
alonso.torres 2021-10-20 14:25:08 +02:00
parent 5e6719e22e
commit eed75bcbda
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -42,6 +42,7 @@
- Fix bug with transformation operations [Taiga #2155](https://tree.taiga.io/project/penpot/issue/2155). - Fix bug with transformation operations [Taiga #2155](https://tree.taiga.io/project/penpot/issue/2155).
- Fix bug in firefox when a text box is inside a mask [Taiga #2152](https://tree.taiga.io/project/penpot/issue/2152). - Fix bug in firefox when a text box is inside a mask [Taiga #2152](https://tree.taiga.io/project/penpot/issue/2152).
- Fix paste in place in arboards [Taiga #2188](https://tree.taiga.io/project/penpot/issue/2188) - Fix paste in place in arboards [Taiga #2188](https://tree.taiga.io/project/penpot/issue/2188)
- Fix stroke cut on shapes export [Taiga #2171](https://tree.taiga.io/project/penpot/issue/2171)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

10
common/src/app/common/geom/shapes.cljc
View file

@ -13,7 +13,8 @@
[app.common.geom.shapes.intersect :as gin] [app.common.geom.shapes.intersect :as gin]
[app.common.geom.shapes.path :as gsp] [app.common.geom.shapes.path :as gsp]
[app.common.geom.shapes.rect :as gpr] [app.common.geom.shapes.rect :as gpr]
[app.common.geom.shapes.transforms :as gtr])) [app.common.geom.shapes.transforms :as gtr]
[app.common.math :as mth]))
;; --- Setup (Initialize) ;; --- Setup (Initialize)
;; FIXME: Is this the correct place for these functions? ;; FIXME: Is this the correct place for these functions?
@ -127,6 +128,13 @@
(assoc :selrect selrect (assoc :selrect selrect
:points points)))) :points points))))
(defn shape-stroke-margin
[shape stroke-width]
(if (= (:type shape) :path)
;; TODO: Calculate with the stroke offset (not implemented yet
(mth/sqrt (* 2 stroke-width stroke-width))
(- (mth/sqrt (* 2 stroke-width stroke-width)) stroke-width)))
;; EXPORTS ;; EXPORTS
(d/export gco/center-shape) (d/export gco/center-shape)

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

@ -202,17 +202,12 @@
:height (- y2 y1)}))))) :height (- y2 y1)})))))
(defn calculate-padding [shape] (defn calculate-padding [shape]
(let [{:keys [stroke-style stroke-alignment stroke-width]} shape] (let [stroke-width (case (:stroke-alignment shape :center)
(cond :center (/ (:stroke-width shape 0) 2)
(and (not= stroke-style :none) :outer (:stroke-width shape 0)
(= stroke-alignment :outer)) 0)
stroke-width margin (gsh/shape-stroke-margin shape stroke-width)]
(+ stroke-width margin)))
(and (not= stroke-style :none)
(= stroke-alignment :center))
(mth/ceil (/ stroke-width 2))
:else 0)))
(mf/defc filters (mf/defc filters
[{:keys [filter-id shape]}] [{:keys [filter-id shape]}]
@ -221,9 +216,7 @@
;; Adds the previous filter as `filter-in` parameter ;; Adds the previous filter as `filter-in` parameter
filters (map #(assoc %1 :filter-in %2) filters (cons nil (map :id filters))) filters (map #(assoc %1 :filter-in %2) filters (cons nil (map :id filters)))
bounds (get-filters-bounds shape filters (or (-> shape :blur :value) 0)) bounds (get-filters-bounds shape filters (or (-> shape :blur :value) 0))
padding (calculate-padding shape)] padding (calculate-padding shape)]
[:* [:*