From 7ddfdb1e15e4001b7d28a3e5c8c94fa3efefbac4 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 24 Jan 2024 13:36:02 +0100
Subject: [PATCH] :bug: Fix grid layout controls being clipped by scroll

---
 .../src/app/main/ui/workspace/viewport.cljs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 23c5714e8..41cb81686 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -377,8 +377,8 @@
        [:clipPath {:id "clip-handlers"}
         [:rect {:x (+ (:x vbox) rule-area-size)
                 :y (+ (:y vbox) rule-area-size)
-                :width (max 0 (- (:width vbox) (* rule-area-size 2)))
-                :height (max 0 (- (:height vbox) (* rule-area-size 2)))}]]]
+                :width (max 0 (- (:width vbox) rule-area-size))
+                :height (max 0 (- (:height vbox) rule-area-size))}]]]
 
       [:g {:style {:pointer-events (if disable-events? "none" "auto")}}
        (when show-text-editor?
@@ -539,12 +539,6 @@
          [:& presence/active-cursors
           {:page-id page-id}])
 
-       [:& scroll-bars/viewport-scrollbars
-        {:objects base-objects
-         :zoom zoom
-         :vbox vbox
-         :bottom-padding (when palete-size (+ palete-size 8))}]
-
        (when-not hide-ui?
          [:& rules/rules
           {:zoom zoom
@@ -637,4 +631,10 @@
               :objects base-objects
               :modifiers modifiers
               :shape frame
-              :view-only true}]))]]]]))
+              :view-only true}]))
+
+        [:& scroll-bars/viewport-scrollbars
+         {:objects base-objects
+          :zoom zoom
+          :vbox vbox
+          :bottom-padding (when palete-size (+ palete-size 8))}]]]]]))