Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-23 06:58:58 -05:00
Code Issues Activity

🐛 Fixes problems with blending modes

Browse source
This commit is contained in:
alonso.torres 2021-04-23 13:28:55 +02:00 • committed by Andrés Moya
parent 1584f3771b
commit 1ee1cada9e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -28,6 +28,7 @@
- Fix problem with pan and space [#811](https://github.com/penpot/penpot/issues/811) - Fix problem with pan and space [#811](https://github.com/penpot/penpot/issues/811)
- Fix issue when parsing exponential numbers in paths - Fix issue when parsing exponential numbers in paths
- Remove legacy system user and team [#843](https://github.com/penpot/penpot/issues/843) - Remove legacy system user and team [#843](https://github.com/penpot/penpot/issues/843)
- Fix problems with blending modes [#837](https://github.com/penpot/penpot/issues/837)
- Fix problem with zoom an selection rect [#845](https://github.com/penpot/penpot/issues/845) - Fix problem with zoom an selection rect [#845](https://github.com/penpot/penpot/issues/845)
- Fix problem displaying team statistics [#859](https://github.com/penpot/penpot/issues/859) - Fix problem displaying team statistics [#859](https://github.com/penpot/penpot/issues/859)
- Fix problems with text editor selection [Taiga #1546](https://tree.taiga.io/project/penpot/issue/1546) - Fix problems with text editor selection [Taiga #1546](https://tree.taiga.io/project/penpot/issue/1546)

5
frontend/src/app/main/ui/shapes/attrs.cljs
View file

@ -121,10 +121,7 @@
(defn add-layer-props [attrs shape] (defn add-layer-props [attrs shape]
(cond-> attrs (cond-> attrs
(:opacity shape) (:opacity shape)
(obj/set! "opacity" (:opacity shape)) (obj/set! "opacity" (:opacity shape))))
(and (:blend-mode shape) (not= (:blend-mode shape) :normal))
(obj/set! "mixBlendMode" (d/name (:blend-mode shape)))))
(defn extract-svg-attrs (defn extract-svg-attrs
[render-id svg-defs svg-attrs] [render-id svg-defs svg-attrs]

6
frontend/src/app/main/ui/shapes/shape.cljs
View file

@ -6,6 +6,7 @@
(ns app.main.ui.shapes.shape (ns app.main.ui.shapes.shape
(:require (:require
[app.common.data :as d]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.main.ui.context :as muc] [app.main.ui.context :as muc]
[app.main.ui.shapes.filters :as filters] [app.main.ui.shapes.filters :as filters]
@ -23,7 +24,10 @@
render-id (mf/use-memo #(str (uuid/next))) render-id (mf/use-memo #(str (uuid/next)))
filter-id (str "filter_" render-id) filter-id (str "filter_" render-id)
styles (-> (obj/new) styles (-> (obj/new)
(obj/set! "pointerEvents" pointer-events)) (obj/set! "pointerEvents" pointer-events)
(cond-> (and (:blend-mode shape) (not= (:blend-mode shape) :normal))
(obj/set! "mixBlendMode" (d/name (:blend-mode shape)))))
{:keys [x y width height type]} shape {:keys [x y width height type]} shape
frame? (= :frame type) frame? (= :frame type)