mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

arrange_windows(): Calculate workspace properties when fullscreen

Browse Source
This commit is contained in:
Ryan Dwyer 2018-04-19 12:50:53 +10:00
parent 2acfbc519e
commit 7e38cc2e05
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sway/tree/layout.c
View File

@ -596,12 +596,6 @@ void arrange_windows(struct sway_container *container,
container->name, container->width, container->height, container->x, container->name, container->width, container->height, container->x,
container->y); container->y);
if (container->type == C_WORKSPACE
&& container->sway_workspace->fullscreen) {
view_configure(container->sway_workspace->fullscreen, 0, 0,
container->parent->width, container->parent->height);
}
double x = 0, y = 0; double x = 0, y = 0;
switch (container->type) { switch (container->type) {
case C_ROOT: case C_ROOT:
@ -628,9 +622,6 @@ void arrange_windows(struct sway_container *container,
return; return;
case C_WORKSPACE: case C_WORKSPACE:
{ {
if (container->sway_workspace->fullscreen) {
return;
}
struct sway_container *output = struct sway_container *output =
container_parent(container, C_OUTPUT); container_parent(container, C_OUTPUT);
struct wlr_box *area = &output->sway_output->usable_area; struct wlr_box *area = &output->sway_output->usable_area;
@ -642,6 +633,11 @@ void arrange_windows(struct sway_container *container,
container->y = y = area->y; container->y = y = area->y;
wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
container->name, container->x, container->y); container->name, container->x, container->y);
if (container->sway_workspace->fullscreen) {
view_configure(container->sway_workspace->fullscreen, 0, 0,
output->width, output->height);
return;
}
} }
// children are properly handled below // children are properly handled below
break; break;