alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

container: don't set fullscreen on children

Browse source 
the original behavior set fullscreen for all descendents of a container,
which causes issues when firefox is one of those children because it
sends its own set_fullscreen request in response to being fullscreened.
This commit is contained in:
ash lea 2021-04-02 20:14:01 -07:00 committed by Ronan Pigott
parent 4e77bc2935
commit eb9e77f4ea
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/tree/container.c
View file

@ -1039,16 +1039,15 @@ void container_end_mouse_operation(struct sway_container *container) {
} }
} }
static void set_fullscreen_iterator(struct sway_container *con, void *data) { static void set_fullscreen(struct sway_container *con, bool enable) {
if (!con->view) { if (!con->view) {
return; return;
} }
if (con->view->impl->set_fullscreen) { if (con->view->impl->set_fullscreen) {
bool *enable = data; con->view->impl->set_fullscreen(con->view, enable);
con->view->impl->set_fullscreen(con->view, *enable);
if (con->view->foreign_toplevel) { if (con->view->foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_set_fullscreen( wlr_foreign_toplevel_handle_v1_set_fullscreen(
con->view->foreign_toplevel, *enable); con->view->foreign_toplevel, enable);
} }
} }
} }
@ -1058,9 +1057,7 @@ static void container_fullscreen_workspace(struct sway_container *con) {
"Expected a non-fullscreen container")) { "Expected a non-fullscreen container")) {
return; return;
} }
bool enable = true; set_fullscreen(con, true);
set_fullscreen_iterator(con, &enable);
container_for_each_child(con, set_fullscreen_iterator, &enable);
con->pending.fullscreen_mode = FULLSCREEN_WORKSPACE; con->pending.fullscreen_mode = FULLSCREEN_WORKSPACE;
con->saved_x = con->pending.x; con->saved_x = con->pending.x;
@ -1094,9 +1091,7 @@ static void container_fullscreen_global(struct sway_container *con) {
"Expected a non-fullscreen container")) { "Expected a non-fullscreen container")) {
return; return;
} }
bool enable = true; set_fullscreen(con, true);
set_fullscreen_iterator(con, &enable);
container_for_each_child(con, set_fullscreen_iterator, &enable);
root->fullscreen_global = con; root->fullscreen_global = con;
con->saved_x = con->pending.x; con->saved_x = con->pending.x;
@ -1122,9 +1117,7 @@ void container_fullscreen_disable(struct sway_container *con) {
"Expected a fullscreen container")) { "Expected a fullscreen container")) {
return; return;
} }
bool enable = false; set_fullscreen(con, false);
set_fullscreen_iterator(con, &enable);
container_for_each_child(con, set_fullscreen_iterator, &enable);
if (container_is_floating(con)) { if (container_is_floating(con)) {
con->pending.x = con->saved_x; con->pending.x = con->saved_x;
@ -1388,10 +1381,6 @@ void container_add_child(struct sway_container *parent,
child->pending.parent = parent; child->pending.parent = parent;
child->pending.workspace = parent->pending.workspace; child->pending.workspace = parent->pending.workspace;
container_for_each_child(child, set_workspace, NULL); container_for_each_child(child, set_workspace, NULL);
bool fullscreen = child->pending.fullscreen_mode != FULLSCREEN_NONE ||
parent->pending.fullscreen_mode != FULLSCREEN_NONE;
set_fullscreen_iterator(child, &fullscreen);
container_for_each_child(child, set_fullscreen_iterator, &fullscreen);
container_handle_fullscreen_reparent(child); container_handle_fullscreen_reparent(child);
container_update_representation(parent); container_update_representation(parent);
node_set_dirty(&child->node); node_set_dirty(&child->node);