mirror of
https://github.com/penpot/penpot.git
synced 2025-01-22 22:49:01 -05:00
🐛 Fix different behaviour during image drag
This commit is contained in:
parent
9e940dc042
commit
08c6e9b702
4 changed files with 9 additions and 4 deletions
|
@ -45,6 +45,7 @@
|
||||||
|
|
||||||
### :bug: Bugs fixed
|
### :bug: Bugs fixed
|
||||||
|
|
||||||
|
- Fix different behaviour during image drag [Taiga #2279](https://tree.taiga.io/project/penpot/issue/2279)
|
||||||
- Fix hidden file name on import [Taiga #3172](https://tree.taiga.io/project/penpot/issue/3172)
|
- Fix hidden file name on import [Taiga #3172](https://tree.taiga.io/project/penpot/issue/3172)
|
||||||
- Fix unneccessary scrollbars at the color list [Taiga #3211](https://tree.taiga.io/project/penpot/issue/3211)
|
- Fix unneccessary scrollbars at the color list [Taiga #3211](https://tree.taiga.io/project/penpot/issue/3211)
|
||||||
- "Show in exports" is showing in multiselections [Taiga #3194](https://tree.taiga.io/project/penpot/issue/3194)
|
- "Show in exports" is showing in multiselections [Taiga #3194](https://tree.taiga.io/project/penpot/issue/3194)
|
||||||
|
|
|
@ -98,7 +98,6 @@
|
||||||
(let [content (if (vector? content) content (into [] content))]
|
(let [content (if (vector? content) content (into [] content))]
|
||||||
(reduce apply-to-index content modifiers))))
|
(reduce apply-to-index content modifiers))))
|
||||||
|
|
||||||
|
|
||||||
(defn get-handler [{:keys [params] :as command} prefix]
|
(defn get-handler [{:keys [params] :as command} prefix]
|
||||||
(let [cx (d/prefix-keyword prefix :x)
|
(let [cx (d/prefix-keyword prefix :x)
|
||||||
cy (d/prefix-keyword prefix :y)]
|
cy (d/prefix-keyword prefix :y)]
|
||||||
|
|
|
@ -160,8 +160,8 @@
|
||||||
;; This stream checks the consecutive mouse positions to do the dragging
|
;; This stream checks the consecutive mouse positions to do the dragging
|
||||||
(->> points
|
(->> points
|
||||||
(streams/move-points-stream snap-toggled start-position selected-points)
|
(streams/move-points-stream snap-toggled start-position selected-points)
|
||||||
(rx/take-until stopper)
|
(rx/map #(move-selected-path-point start-position %))
|
||||||
(rx/map #(move-selected-path-point start-position %)))
|
(rx/take-until stopper))
|
||||||
(rx/of (apply-content-modifiers)))))))
|
(rx/of (apply-content-modifiers)))))))
|
||||||
|
|
||||||
(defn- get-displacement
|
(defn- get-displacement
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
(ns app.main.ui.workspace.shapes.path
|
(ns app.main.ui.workspace.shapes.path
|
||||||
(:require
|
(:require
|
||||||
[app.common.path.commands :as upc]
|
[app.common.path.commands :as upc]
|
||||||
|
[app.main.data.workspace.path.helpers :as helpers]
|
||||||
[app.main.refs :as refs]
|
[app.main.refs :as refs]
|
||||||
[app.main.ui.shapes.path :as path]
|
[app.main.ui.shapes.path :as path]
|
||||||
[app.main.ui.shapes.shape :refer [shape-container]]
|
[app.main.ui.shapes.shape :refer [shape-container]]
|
||||||
|
@ -21,7 +22,11 @@
|
||||||
content-modifiers (mf/deref content-modifiers-ref)
|
content-modifiers (mf/deref content-modifiers-ref)
|
||||||
editing-id (mf/deref refs/selected-edition)
|
editing-id (mf/deref refs/selected-edition)
|
||||||
editing? (= editing-id (:id shape))
|
editing? (= editing-id (:id shape))
|
||||||
shape (update shape :content upc/apply-content-modifiers content-modifiers)]
|
shape (update shape :content upc/apply-content-modifiers content-modifiers)
|
||||||
|
|
||||||
|
[_ new-selrect]
|
||||||
|
(helpers/content->points+selrect shape (:content shape))
|
||||||
|
shape (assoc shape :selrect new-selrect)]
|
||||||
|
|
||||||
[:> shape-container {:shape shape
|
[:> shape-container {:shape shape
|
||||||
:pointer-events (when editing? "none")}
|
:pointer-events (when editing? "none")}
|
||||||
|
|
Loading…
Add table
Reference in a new issue