summaryrefslogtreecommitdiff
path: root/include/sway/tree/container.h
diff options
context:
space:
mode:
authorWill McKinnon <[email protected]>2022-08-15 00:54:07 -0400
committerWill McKinnon <[email protected]>2022-08-15 00:54:07 -0400
commit7b530bf4487f36273938ffd7236dad8a7629790a (patch)
tree0c5cdceb7fbda31530d2d32388db8e27f67748a0 /include/sway/tree/container.h
parentcf1ed777ae56f677bcc0f832c52c04dc65be18ce (diff)
Revert "merge sway master"
This reverts commit 7460d9f565092836f81b917a040caff57142d91a.
Diffstat (limited to 'include/sway/tree/container.h')
-rw-r--r--include/sway/tree/container.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 751612e2..05761150 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,7 +2,7 @@
#define _SWAY_CONTAINER_H
#include <stdint.h>
#include <sys/types.h>
-#include <wlr/types/wlr_compositor.h>
+#include <wlr/types/wlr_surface.h>
#include "list.h"
#include "sway/tree/node.h"
@@ -364,7 +364,7 @@ bool container_is_sticky_or_child(struct sway_container *con);
* This will destroy pairs of redundant H/V splits
* e.g. H[V[H[app app]] app] -> H[app app app]
* The middle "V[H[" are eliminated by a call to container_squash
- * on the V[ con. It's grandchildren are added to its parent.
+ * on the V[ con. It's grandchildren are added to it's parent.
*
* This function is roughly equivalent to i3's tree_flatten here:
* https://github.com/i3/i3/blob/1f0c628cde40cf87371481041b7197344e0417c6/src/tree.c#L651