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

Merge 1c312c4ada into 4d43f1dd99

Browse source
This commit is contained in:
Tudor Brindus 2021-01-28 15:47:08 +09:00 • committed by GitHub
commit 9fb3a40b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -1226,12 +1226,18 @@ void container_discover_outputs(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) {
return con->parent->layout;
}
if (con->workspace) {
return con->workspace->layout;
}
return L_NONE;
}

3
sway/tree/view.c
View file

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