Implement default_floating_border command and adjust CSD behaviour

1 files changed, 8 insertions, 3 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 6d52c38c..3f9d701a 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -967,9 +967,14 @@ void container_set_geometry_from_floating_view(struct sway_container *con) {
                 return;
         }
         struct sway_view *view = con->sway_view;
-        size_t border_width = view->border_thickness * (view->border != B_NONE);
-        size_t top =
-                view->border == B_NORMAL ? container_titlebar_height() : border_width;
+        size_t border_width = 0;
+        size_t top = 0;
+
+        if (!view->using_csd) {
+                border_width = view->border_thickness * (view->border != B_NONE);
+                top = view->border == B_NORMAL ?
+                        container_titlebar_height() : border_width;
+        }
 
         con->x = view->x - border_width;
         con->y = view->y - top;