Skip to content

Commit 78311f4

Browse files
committed
simplify duplicate event
1 parent 61a847a commit 78311f4

File tree

7 files changed

+11
-18
lines changed

7 files changed

+11
-18
lines changed

src/renderer/element/events.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@
184184
(h/paste-styles db)))
185185

186186
(rf/reg-event-db
187-
::duplicate-in-place
187+
::duplicate
188188
[(finalize "Duplicate selection")]
189189
(fn [db]
190-
(h/duplicate-in-place db)))
190+
(h/duplicate db)))
191191

192192
(rf/reg-event-db
193193
::translate

src/renderer/element/handlers.cljs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -695,18 +695,11 @@
695695
(not= (:id (root db)) (:id parent-el))
696696
(translate [(- s-x1) (- s-y1)])) (selected-ids db)))))
697697

698-
(m/=> duplicate-in-place [:-> App App])
699-
(defn duplicate-in-place
698+
(m/=> duplicate [:-> App App])
699+
(defn duplicate
700700
[db]
701701
(reduce create (deselect db) (top-selected-sorted db)))
702702

703-
(m/=> duplicate [:-> App Vec2D App])
704-
(defn duplicate
705-
[db offset]
706-
(-> db
707-
(duplicate-in-place)
708-
(translate offset)))
709-
710703
(defn animate
711704
([db tag attrs]
712705
(reduce (partial-right animate tag attrs) (deselect db) (selected db)))

src/renderer/element/views.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{:label "Animate Motion"
2929
:action [::element.e/animate :animateMotion {}]}
3030
{:type :separator}
31-
{:label "Duplicate in place"
32-
:action [::element.e/duplicate-in-place]}
31+
{:label "Duplicate"
32+
:action [::element.e/duplicate]}
3333
{:label "Delete"
3434
:action [::element.e/delete]}])

src/renderer/menubar/views.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
:icon "copy"
148148
:label "Duplicate"
149149
:disabled (not @(rf/subscribe [::element.s/some-selected]))
150-
:action [::element.e/duplicate-in-place]}
150+
:action [::element.e/duplicate]}
151151
{:id :divider-3
152152
:type :separator}
153153
{:id :select-all

src/renderer/tool/impl/base/transform.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@
279279
(if alt-key?
280280
(-> db
281281
(history.h/swap)
282-
(select-element (pointer/shift? e))
283-
(element.h/duplicate delta)
282+
(element.h/duplicate)
283+
(translate delta)
284284
(snap.h/snap-with element.h/translate)
285285
(app.h/set-cursor "copy"))
286286
(app.h/set-state db :translate))

src/renderer/utils/keyboard.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
[{:keyCode (key-codes "D")
131131
:ctrlKey true
132132
:shiftKey true}]]
133-
[[::element.e/duplicate-in-place]
133+
[[::element.e/duplicate]
134134
[{:keyCode (key-codes "D")
135135
:ctrlKey true}]]
136136
[[::element.e/boolean-operation :exclude]

src/user.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
(defn ^:export duplicate
6161
"Duplicates the selected elements."
6262
[]
63-
(rf/dispatch [::element.e/duplicate-in-place]))
63+
(rf/dispatch [::element.e/duplicate]))
6464

6565
(defn ^:export create
6666
"Creates a new element."

0 commit comments

Comments
 (0)