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

floating: fix size of non-view containers

Browse source 
This fixes the sizing of floating non-view containers. On master, the
floater will get set to the maximum width and height, which by default
is the entire output layout. When setting a non-view container to
floating, this will set a sane default size of 50% of the workspace
width and 75% of the workspace height, or whatever the closest is that
the minimum and maximum floating width/height values allow for. On all
future calls to `floating_natural_resize`, the width and height will be
kept unless they need to be changed to respect the min/max floating
width/height values.
This commit is contained in:
Brian Ashworth 2019-03-29 12:15:17 -04:00 committed by Drew DeVault
parent dd28e6a6d6
commit 0676ace97f
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sway/tree/container.c
View file

@ -654,8 +654,8 @@ static void floating_natural_resize(struct sway_container *con) {
floating_calculate_constraints(&min_width, &max_width, floating_calculate_constraints(&min_width, &max_width,
&min_height, &max_height); &min_height, &max_height);
if (!con->view) { if (!con->view) {
con->width = max_width; con->width = fmax(min_width, fmin(con->width, max_width));
con->height = max_height; con->height = fmax(min_height, fmin(con->height, max_height));
} else { } else {
struct sway_view *view = con->view; struct sway_view *view = con->view;
con->content_width = con->content_width =
@ -712,6 +712,22 @@ void container_floating_resize_and_center(struct sway_container *con) {
} }
} }
static void container_floating_set_default_size(struct sway_container *con) {
if (!sway_assert(con->workspace, "Expected a container on a workspace")) {
return;
}
int min_width, max_width, min_height, max_height;
floating_calculate_constraints(&min_width, &max_width,
&min_height, &max_height);
struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
workspace_get_box(con->workspace, box);
if (!con->view) {
con->width = fmax(min_width, fmin(box->width * 0.5, max_width));
con->height = fmax(min_height, fmin(box->height * 0.75, max_height));
}
free(box);
}
void container_set_floating(struct sway_container *container, bool enable) { void container_set_floating(struct sway_container *container, bool enable) {
if (container_is_floating(container) == enable) { if (container_is_floating(container) == enable) {
return; return;
@ -724,6 +740,7 @@ void container_set_floating(struct sway_container *container, bool enable) {
struct sway_container *old_parent = container->parent; struct sway_container *old_parent = container->parent;
container_detach(container); container_detach(container);
workspace_add_floating(workspace, container); workspace_add_floating(workspace, container);
container_floating_set_default_size(container);
container_floating_resize_and_center(container); container_floating_resize_and_center(container);
if (container->view) { if (container->view) {
view_set_tiled(container->view, false); view_set_tiled(container->view, false);