diff --git a/CHANGES.md b/CHANGES.md index a91366afc9..dd37200f97 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,12 @@ ### :heart: Community contributions by (Thank you!) +## 1.19.5 + +### :bug: New features + +- Fix problem with alignment performance + ## 1.19.4 ### :sparkles: New features diff --git a/common/src/app/common/geom/align.cljc b/common/src/app/common/geom/align.cljc index 1aa4120f82..bec0ee78f3 100644 --- a/common/src/app/common/geom/align.cljc +++ b/common/src/app/common/geom/align.cljc @@ -18,25 +18,18 @@ (declare calc-align-pos) -(defn- recursive-move - "Move the shape and all its recursive children." - [shape dpoint objects] - (->> (get-children objects (:id shape)) - (cons shape) - (map #(gsh/move % dpoint)))) - (defn align-to-rect "Move the shape so that it is aligned with the given rectangle in the given axis. Take account the form of the shape and the possible rotation. What is aligned is the rectangle that wraps the shape with the given rectangle. If the shape is a group, move also all of its recursive children." - [shape rect axis objects] + [shape rect axis] (let [wrapper-rect (gsh/shapes->rect [shape]) - align-pos (calc-align-pos wrapper-rect rect axis) - delta (gpt/point (- (:x align-pos) (:x wrapper-rect)) - (- (:y align-pos) (:y wrapper-rect)))] - (recursive-move shape delta objects))) + align-pos (calc-align-pos wrapper-rect rect axis) + delta {:x (- (:x align-pos) (:x wrapper-rect)) + :y (- (:y align-pos) (:y wrapper-rect))}] + (gsh/move shape delta))) (defn calc-align-pos [wrapper-rect rect axis] @@ -75,7 +68,7 @@ It takes into account the form of the shape and the rotation, what is distributed is the wrapping rectangles of the shapes. If any shape is a group, move also all of its recursive children." - [shapes axis objects] + [shapes axis] (let [coord (if (= axis :horizontal) :x :y) other-coord (if (= axis :horizontal) :y :x) size (if (= axis :horizontal) :width :height) @@ -88,9 +81,9 @@ ; The total space between shapes space (reduce - (size wrapper-rect) (map size wrapped-shapes)) unit-space (/ space (- (count wrapped-shapes) 1)) - ; Calculate the distance we need to move each shape. - ; The new position of each one is the position of the - ; previous one plus its size plus the unit space. + ;; Calculate the distance we need to move each shape. + ;; The new position of each one is the position of the + ;; previous one plus its size plus the unit space. deltas (loop [shapes' wrapped-shapes start-pos (coord wrapper-rect) deltas []] @@ -102,11 +95,11 @@ (if (= (count shapes') 1) (conj deltas delta) (recur (rest shapes') - new-pos - (conj deltas delta)))))] + new-pos + (conj deltas delta)))))] - (mapcat #(recursive-move %1 {coord %2 other-coord 0} objects) - sorted-shapes deltas))) + (map #(gsh/move %1 {coord %2 other-coord 0}) + sorted-shapes deltas))) ;; Adjust to viewport diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index 1bd819f806..0243c4e11e 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1037,9 +1037,6 @@ ;; --- Shape / Selection Alignment and Distribution -(declare align-object-to-parent) -(declare align-objects-list) - (defn can-align? [selected objects] (cond (empty? selected) false @@ -1047,11 +1044,18 @@ :else (not= uuid/zero (:parent-id (get objects (first selected)))))) -(defn- move-shape - [shape] - (let [bbox (-> shape :points grc/points->rect) - pos (gpt/point (:x bbox) (:y bbox))] - (dwt/update-position (:id shape) pos))) +(defn align-object-to-parent + [objects object-id axis] + (let [object (get objects object-id) + parent-id (:parent-id (get objects object-id)) + parent (get objects parent-id)] + [(gal/align-to-rect object parent axis)])) + +(defn align-objects-list + [objects selected axis] + (let [selected-objs (map #(get objects %) selected) + rect (gsh/shapes->rect selected-objs)] + (map #(gal/align-to-rect % rect axis) selected-objs))) (defn align-objects [axis] @@ -1067,27 +1071,12 @@ moved (if (= 1 (count selected)) (align-object-to-parent objects (first selected) axis) (align-objects-list objects selected axis)) - undo-id (js/Symbol)] + undo-id (js/Symbol)] (when (can-align? selected objects) - (rx/concat - (rx/of (dwu/start-undo-transaction undo-id)) - (->> (rx/from moved) - (rx/map move-shape)) - (rx/of (ptk/data-event :layout/update (mapv :id moved)) - (dwu/commit-undo-transaction undo-id)))))))) - -(defn align-object-to-parent - [objects object-id axis] - (let [object (get objects object-id) - parent-id (:parent-id (get objects object-id)) - parent (get objects parent-id)] - (gal/align-to-rect object parent axis objects))) - -(defn align-objects-list - [objects selected axis] - (let [selected-objs (map #(get objects %) selected) - rect (gsh/shapes->rect selected-objs)] - (mapcat #(gal/align-to-rect % rect axis objects) selected-objs))) + (rx/of (dwu/start-undo-transaction undo-id) + (dwt/position-shapes moved) + (ptk/data-event :layout/update selected) + (dwu/commit-undo-transaction undo-id))))))) (defn can-distribute? [selected] (cond @@ -1108,14 +1097,13 @@ objects (wsh/lookup-page-objects state page-id) selected (wsh/lookup-selected state) moved (-> (map #(get objects %) selected) - (gal/distribute-space axis objects)) - - moved (d/index-by :id moved) - ids (keys moved) - - update-fn #(get moved (:id %))] + (gal/distribute-space axis)) + undo-id (js/Symbol)] (when (can-distribute? selected) - (rx/of (dch/update-shapes ids update-fn {:reg-objects? true}))))))) + (rx/of (dwu/start-undo-transaction undo-id) + (dwt/position-shapes moved) + (ptk/data-event :layout/update selected) + (dwu/commit-undo-transaction undo-id))))))) ;; --- Shape Proportions diff --git a/frontend/src/app/main/data/workspace/modifiers.cljs b/frontend/src/app/main/data/workspace/modifiers.cljs index eb3d4ea119..2c11d0a8a7 100644 --- a/frontend/src/app/main/data/workspace/modifiers.cljs +++ b/frontend/src/app/main/data/workspace/modifiers.cljs @@ -440,14 +440,15 @@ ([] (apply-modifiers nil)) - ([{:keys [modifiers undo-transation? stack-undo?] :or {undo-transation? true stack-undo? false}}] + ([{:keys [modifiers undo-transation? stack-undo? ignore-constraints ignore-snap-pixel] + :or {undo-transation? true stack-undo? false ignore-constraints false ignore-snap-pixel false}}] (ptk/reify ::apply-modifiers ptk/WatchEvent (watch [_ state _] (let [text-modifiers (get state :workspace-text-modifier) objects (wsh/lookup-page-objects state) object-modifiers (if modifiers - (calculate-modifiers state modifiers) + (calculate-modifiers state ignore-constraints ignore-snap-pixel modifiers) (get state :workspace-modifiers)) ids (or (keys object-modifiers) []) diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs index 48403d3626..98fc79cd4f 100644 --- a/frontend/src/app/main/data/workspace/transforms.cljs +++ b/frontend/src/app/main/data/workspace/transforms.cljs @@ -732,8 +732,31 @@ modif-tree (dwm/create-modif-tree [id] (ctm/move-modifiers delta))] - (rx/of (dwm/set-modifiers modif-tree false true) - (dwm/apply-modifiers)))))) + (rx/of (dwm/apply-modifiers {:modifiers modif-tree + :ignore-constraints false + :ignore-snap-pixel true})))))) + +(defn position-shapes + [shapes] + (ptk/reify ::position-shapes + ptk/WatchEvent + (watch [_ state _] + (let [objects (wsh/lookup-page-objects state) + shapes (d/index-by :id shapes) + + modif-tree + (dwm/build-modif-tree + (keys shapes) + objects + (fn [cshape] + (let [oshape (get shapes (:id cshape)) + cpos (-> cshape :points first gpt/point) + opos (-> oshape :points first gpt/point)] + (ctm/move-modifiers (gpt/subtract opos cpos)))))] + + (rx/of (dwm/apply-modifiers {:modifiers modif-tree + :ignore-constraints false + :ignore-snap-pixel true})))))) (defn- move-shapes-to-frame [ids frame-id drop-index] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/align.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/align.cljs index d3a016128a..1632e7b51a 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/align.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/align.cljs @@ -167,7 +167,7 @@ [:div.align-button.tooltip.tooltip-bottom-left {:alt (tr "workspace.align.vdistribute" (sc/get-tooltip :v-distribute)) :class (when disabled-distribute "disabled") - :data-value :horizontal + :data-value :vertical :on-click distribute-objects} i/shape-vdistribute]]]))))