mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-25 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree/container: use L_NONE for parent layout of floating container

Browse source 
The parent of a floating container is technically the workspace, but it
is incorrect to say that the parent layout of a floating container is
that of the workspace.

For instance, if the workspace layout is tabbed, a floating container
should not (and does not) show tab decorations. However, prior to this
commit, querying its parent layout would nonetheless return `L_TABBED`.

Fixes #5782.
This commit is contained in:
Tudor Brindus 2020-11-02 17:59:23 -05:00
parent c523aa623b
commit 1c312c4ada
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/container.c
View file

@ -1225,12 +1225,18 @@ void container_discover_outputs(struct sway_container *con) {
} }
enum sway_container_layout container_parent_layout(struct sway_container *con) { enum sway_container_layout container_parent_layout(struct sway_container *con) {
if (container_is_floating(con)) {
return L_NONE;
}
if (con->parent) { if (con->parent) {
return con->parent->layout; return con->parent->layout;
} }
if (con->workspace) { if (con->workspace) {
return con->workspace->layout; return con->workspace->layout;
} }
return L_NONE; return L_NONE;
} }

3
sway/tree/view.c
View file

@ -1258,8 +1258,7 @@ bool view_is_visible(struct sway_view *view) {
struct sway_container *con = view->container; struct sway_container *con = view->container;
while (con) { while (con) {
enum sway_container_layout layout = container_parent_layout(con); enum sway_container_layout layout = container_parent_layout(con);
if ((layout == L_TABBED || layout == L_STACKED) if (layout == L_TABBED || layout == L_STACKED) {
&& !container_is_floating(con)) {
struct sway_node *parent = con->parent ? struct sway_node *parent = con->parent ?
&con->parent->node : &con->workspace->node; &con->parent->node : &con->workspace->node;
if (seat_get_active_tiling_child(seat, parent) != &con->node) { if (seat_get_active_tiling_child(seat, parent) != &con->node) {