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

Flesh out fullscreen support a bit

Browse source
This commit is contained in:
Drew DeVault 2015-08-09 20:49:19 -04:00
parent b922e1cb29
commit 0078a6fa36
2 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/commands.c
View file

@ -224,7 +224,8 @@ int cmd_fullscreen(struct sway_config *config, int argc, char **argv) {
} }
swayc_t *container = get_focused_container(&root_container); swayc_t *container = get_focused_container(&root_container);
wlc_view_set_state(container->handle, WLC_BIT_FULLSCREEN, true); bool current = (wlc_view_get_state(container->handle) & WLC_BIT_FULLSCREEN) > 0;
wlc_view_set_state(container->handle, WLC_BIT_FULLSCREEN, !current);
arrange_windows(container, -1, -1); arrange_windows(container, -1, -1);
return 1; return 1;

41
sway/layout.c
View file

@ -41,29 +41,6 @@ void arrange_windows(swayc_t *container, int width, int height) {
} }
return; return;
case C_VIEW: case C_VIEW:
// If the view is fullscreen, we need to tell wlc to draw it as such
if (wlc_view_get_state(container->handle) & WLC_BIT_FULLSCREEN) {
swayc_t *parent = container;
do {
parent = parent->parent;
} while(parent->type != C_OUTPUT);
sway_log(L_DEBUG, "res %d %d", parent->width, parent->height);
struct wlc_geometry geometry = {
.origin = {
.x = 0,
.y = 0
},
.size = {
.w = parent->width,
.h = parent->height
}
};
wlc_view_set_geometry(container->handle, &geometry);
return;
}
sway_log(L_DEBUG, "Setting view to %d x %d @ %d, %d", width, height, container->x, container->y); sway_log(L_DEBUG, "Setting view to %d x %d @ %d, %d", width, height, container->x, container->y);
struct wlc_geometry geometry = { struct wlc_geometry geometry = {
.origin = { .origin = {
@ -75,9 +52,21 @@ void arrange_windows(swayc_t *container, int width, int height) {
.h = height .h = height
} }
}; };
wlc_view_set_geometry(container->handle, &geometry); if (wlc_view_get_state(container->handle) & WLC_BIT_FULLSCREEN) {
container->width = width; swayc_t *parent = container;
container->height = height; while(parent->type != C_OUTPUT) {
parent = parent->parent;
}
geometry.origin.x = 0;
geometry.origin.y = 0;
geometry.size.w = parent->width;
geometry.size.h = parent->height;
wlc_view_set_geometry(container->handle, &geometry);
} else {
wlc_view_set_geometry(container->handle, &geometry);
container->width = width;
container->height = height;
}
return; return;
default: default:
container->width = width; container->width = width;