diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-17 10:14:33 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-17 10:14:33 +1000 |
commit | 75c699db62e63e2a3c2aa652c9ba9482a8f13ec3 (patch) | |
tree | f8b454f2e07f894443cfa76ab48ae0e3fa372829 /sway/tree/container.c | |
parent | Merge pull request #2285 from emersion/cleanup-swayidle (diff) | |
download | sway-75c699db62e63e2a3c2aa652c9ba9482a8f13ec3.tar.gz sway-75c699db62e63e2a3c2aa652c9ba9482a8f13ec3.tar.zst sway-75c699db62e63e2a3c2aa652c9ba9482a8f13ec3.zip |
Implement default_floating_border command and adjust CSD behaviour
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 11 |
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) { | |||
967 | return; | 967 | return; |
968 | } | 968 | } |
969 | struct sway_view *view = con->sway_view; | 969 | struct sway_view *view = con->sway_view; |
970 | size_t border_width = view->border_thickness * (view->border != B_NONE); | 970 | size_t border_width = 0; |
971 | size_t top = | 971 | size_t top = 0; |
972 | view->border == B_NORMAL ? container_titlebar_height() : border_width; | 972 | |
973 | if (!view->using_csd) { | ||
974 | border_width = view->border_thickness * (view->border != B_NONE); | ||
975 | top = view->border == B_NORMAL ? | ||
976 | container_titlebar_height() : border_width; | ||
977 | } | ||
973 | 978 | ||
974 | con->x = view->x - border_width; | 979 | con->x = view->x - border_width; |
975 | con->y = view->y - top; | 980 | con->y = view->y - top; |