From c3c41c5b7dc49b49d73033bf362beb0e96630ff7 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Fri, 24 Mar 2023 17:40:42 +0100 Subject: [PATCH] :bug: Fix rotate board breaks paddings --- frontend/src/app/main/data/workspace/shape_layout.cljs | 6 +++--- frontend/src/app/main/ui/workspace/viewport.cljs | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/main/data/workspace/shape_layout.cljs b/frontend/src/app/main/data/workspace/shape_layout.cljs index eb552622e..fe798b11f 100644 --- a/frontend/src/app/main/data/workspace/shape_layout.cljs +++ b/frontend/src/app/main/data/workspace/shape_layout.cljs @@ -150,9 +150,9 @@ {:p1 (min (- min-y (:y1 parent-selrect)) (- (:y2 parent-selrect) max-y)) :p2 (min (- min-x (:x1 parent-selrect)) (- (:x2 parent-selrect) max-x))})] - (cond-> {:layout-flex-dir direction} - (not (nil? padding)) (assoc :layout-padding {:p1 (:p1 padding) :p2 (:p2 padding) :p3 (:p1 padding) :p4 (:p2 padding)}) - (not (nil? layout-gap)) (assoc :layout-gap layout-gap))))) + (cond-> {:layout-flex-dir direction :layout-gap layout-gap} + (not (nil? padding)) + (assoc :layout-padding {:p1 (:p1 padding) :p2 (:p2 padding) :p3 (:p1 padding) :p4 (:p2 padding)}))))) (defn shapes->grid-params "Given the shapes calculate its flex parameters (horizontal vs vertical, gaps, etc)" diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index dc10c4f7f..f96c44b68 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -225,12 +225,14 @@ show-padding? (and (nil? transform) (= (count selected-shapes) 1) (= (:type (first selected-shapes)) :frame) - (= (:layout (first selected-shapes)) :flex)) + (= (:layout (first selected-shapes)) :flex) + (zero? (:rotation (first selected-shapes)))) show-margin? (and (nil? transform) (= (count selected-shapes) 1) - (= (:layout selected-frame) :flex))] + (= (:layout selected-frame) :flex) + (zero? (:rotation (first selected-shapes))))] (hooks/setup-dom-events zoom disable-paste in-viewport? workspace-read-only?) (hooks/setup-viewport-size vport viewport-ref)