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

Merge branch 'develop' into refactor-ui-integration

Browse source
This commit is contained in:
Andrey Antukh 2019-12-18 10:57:24 +01:00
commit 9c1c613c90
32 changed files with 551 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/uxbox/main/ui/shapes/common.cljs
View file

@ -39,7 +39,7 @@
(->> (uws/mouse-position-deltas position)
(rx/map #(dw/apply-temporal-displacement-in-bulk selected %))
(rx/take-until stoper))
(rx/of (dw/materialize-current-modifier-in-bulk selected)
(rx/of (dw/materialize-temporal-modifier-in-bulk selected)
::dw/page-data-update))))))
(defn on-mouse-down

2
frontend/src/uxbox/main/ui/workspace/selection.cljs
View file

@ -72,7 +72,7 @@
(rx/map normalize-proportion-lock)
(rx/mapcat (partial resize shape))
(rx/take-until stoper))
(rx/of (dw/materialize-current-modifier-in-bulk ids)
(rx/of (dw/materialize-temporal-modifier-in-bulk ids)
::dw/page-data-update)))))))
;; --- Controls (Component)

25
frontend/src/uxbox/main/ui/workspace/shortcuts.cljs
View file

@ -22,20 +22,21 @@
;; --- Shortcuts
(defonce +shortcuts+
{:shift+g #(st/emit! (dw/toggle-flag :grid))
:ctrl+shift+m #(st/emit! (dw/toggle-flag :sitemap))
:ctrl+shift+f #(st/emit! (dw/toggle-flag :drawtools))
:ctrl+shift+i #(st/emit! (dw/toggle-flag :icons))
:ctrl+shift+l #(st/emit! (dw/toggle-flag :layers))
{
;; :shift+g #(st/emit! (dw/toggle-flag :grid))
:ctrl+shift+m #(st/emit! (dw/toggle-layout-flag :sitemap))
:ctrl+shift+f #(st/emit! (dw/toggle-layout-flag :drawtools))
:ctrl+shift+i #(st/emit! (dw/toggle-layout-flag :icons))
:ctrl+shift+l #(st/emit! (dw/toggle-layout-flag :layers))
:ctrl+0 #(st/emit! (dw/reset-zoom))
:ctrl+r #(st/emit! (dw/toggle-flag :ruler))
;; :ctrl+r #(st/emit! (dw/toggle-flag :ruler))
:ctrl+d #(st/emit! dw/duplicate-selected)
:ctrl+c #(st/emit! (dw/copy-to-clipboard))
:ctrl+v #(st/emit! (dw/paste-from-clipboard))
:ctrl+shift+v #(dl/open! :clipboard)
:ctrl+z #(st/emit! du/undo)
:ctrl+shift+z #(st/emit! du/redo)
:ctrl+y #(st/emit! du/redo)
;; :ctrl+c #(st/emit! (dw/copy-to-clipboard))
;; :ctrl+v #(st/emit! (dw/paste-from-clipboard))
;; :ctrl+shift+v #(dl/open! :clipboard)
;; :ctrl+z #(st/emit! du/undo)
;; :ctrl+shift+z #(st/emit! du/redo)
;; :ctrl+y #(st/emit! du/redo)
:ctrl+b #(st/emit! (dw/select-for-drawing :rect))
:ctrl+e #(st/emit! (dw/select-for-drawing :circle))
:ctrl+t #(st/emit! (dw/select-for-drawing :text))

1
frontend/src/uxbox/main/ui/workspace/streams.cljs
View file

@ -94,7 +94,6 @@
(rx/subscribe-with ob sub)
sub))
(defn mouse-position-deltas
[current]
(->> (rx/concat (rx/of current)