diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-24 20:54:57 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-27 22:51:37 +1000 |
commit | 7b138e5ef0f679c9bb0078019d7c9c63fef36273 (patch) | |
tree | 2cdbeb394889065e0606a1fcbe38c1e99e25d260 /sway/tree/container.c | |
parent | Merge pull request #2717 from ianyfan/tablet-config (diff) | |
download | sway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.tar.gz sway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.tar.zst sway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.zip |
Add CSD to border modes
This replaces view.using_csd with a new border mode: B_CSD. This also
removes sway_xdg_shell{_v6}_view.deco_mode and
view->has_client_side_decorations as we can now get these from the
border.
You can use `border toggle` to cycle through the modes including CSD, or
use `border csd` to set it directly. The client must support the
xdg-decoration protocol, and the only client I know of that does is the
example in wlroots.
If the client switches from SSD to CSD without us expecting it (via the
server-decoration protocol), we stash the previous border type into
view.saved_border so we can restore it if the client returns to SSD. I
haven't found a way to test this though.
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index baaa82fd..d75e34a5 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -715,7 +715,7 @@ void container_set_geometry_from_floating_view(struct sway_container *con) { | |||
715 | size_t border_width = 0; | 715 | size_t border_width = 0; |
716 | size_t top = 0; | 716 | size_t top = 0; |
717 | 717 | ||
718 | if (!view->using_csd) { | 718 | if (view->border != B_CSD) { |
719 | border_width = view->border_thickness * (view->border != B_NONE); | 719 | border_width = view->border_thickness * (view->border != B_NONE); |
720 | top = view->border == B_NORMAL ? | 720 | top = view->border == B_NORMAL ? |
721 | container_titlebar_height() : border_width; | 721 | container_titlebar_height() : border_width; |