Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-18 21:06:11 -05:00
Code Issues Activity

Integrate the new way to handle grid snap.

Browse source 
Related to #79 and #80
This commit is contained in:
Andrey Antukh 2017-03-25 19:48:45 +01:00
parent a7236c17f2
commit d5b7dcc663
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
3 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/uxbox/main/refs.cljs
View file

@ -108,12 +108,9 @@
(defn alignment-activated? (defn alignment-activated?
[state] [state]
(let [{:keys [page flags]} (:workspace state) (let [{:keys [flags]} (:workspace state)]
metadata (->> (get-in state [:pages page :metadata])
(merge c/page-metadata))]
(and (contains? flags :grid-indexed) (and (contains? flags :grid-indexed)
(contains? flags :grid) (contains? flags :grid-snap))))
(:grid-alignment metadata))))
(def selected-alignment (def selected-alignment
(-> (l/lens alignment-activated?) (-> (l/lens alignment-activated?)

4
frontend/src/uxbox/main/ui/workspace/header.cljs
View file

@ -134,8 +134,8 @@
i/grid] i/grid]
[:li.tooltip.tooltip-bottom [:li.tooltip.tooltip-bottom
{:alt "Snap to grid" {:alt "Snap to grid"
:class (when (contains? flags :grid) "selected") :class (when (contains? flags :grid-snap) "selected")
:on-click (partial toggle :grid)} :on-click (partial toggle :grid-snap)}
i/grid-snap]] i/grid-snap]]
;; [:li.tooltip.tooltip-bottom ;; [:li.tooltip.tooltip-bottom
;; {:alt "Align (Ctrl + A)"} ;; {:alt "Align (Ctrl + A)"}

17
frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
View file

@ -124,10 +124,6 @@
(->> (assoc metadata :grid-color value) (->> (assoc metadata :grid-color value)
(udp/update-metadata id) (udp/update-metadata id)
(st/emit!)))) (st/emit!))))
(on-magnet-change []
(let [checked? (dom/checked? (mx/ref-node own "magnet"))
metadata (assoc metadata :grid-alignment checked?)]
(st/emit! (udw/update-metadata id metadata))))
(show-color-picker [event] (show-color-picker [event]
(let [x (.-clientX event) (let [x (.-clientX event)
y (.-clientY event) y (.-clientY event)
@ -164,15 +160,4 @@
[:input [:input
{:on-change on-color-change {:on-change on-color-change
:ref "color" :ref "color"
:value (:grid-color metadata "#cccccc")}]]] :value (:grid-color metadata "#cccccc")}]]]]])))
[:span "Magnet option"]
[:div.row-flex
[:div.input-checkbox.check-primary
[:input
{:type "checkbox"
:ref "magnet"
:id "magnet"
:on-change on-magnet-change
:checked (when (:grid-alignment metadata) "checked")}]
[:label {:for "magnet"} "Activate magnet"]]]]])))