diff options
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 5 | ||||
| -rw-r--r-- | sway/tree/view.c | 22 | ||||
| -rw-r--r-- | sway/tree/workspace.c | 10 |
3 files changed, 21 insertions, 16 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 58d3df34..8ab6ebf8 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -676,11 +676,8 @@ void container_set_floating(struct sway_container *container, bool enable) { container_detach(container); struct sway_container *reference = seat_get_focus_inactive_tiling(seat, workspace); - if (reference && reference->view) { - reference = reference->parent; - } if (reference) { - container_add_child(reference, container); + container_add_sibling(reference, container, 1); container->width = reference->width; container->height = reference->height; } else { diff --git a/sway/tree/view.c b/sway/tree/view.c index 4bc9e0f3..cf67acbb 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -242,23 +242,23 @@ void view_autoconfigure(struct sway_view *view) { view->border_bottom = bottom_y != ws->y + ws->height; } - double x, y, width, height; - x = y = width = height = 0; - double y_offset = 0; - // In a tabbed or stacked container, the container's y is the top of the // title area. We have to offset the surface y by the height of the title, // bar, and disable any top border because we'll always have the title bar. + double y_offset = 0; enum sway_container_layout layout = container_parent_layout(con); - if (layout == L_TABBED && !container_is_floating(con)) { - y_offset = container_titlebar_height(); - view->border_top = false; - } else if (layout == L_STACKED && !container_is_floating(con)) { - list_t *siblings = container_get_siblings(con); - y_offset = container_titlebar_height() * siblings->length; - view->border_top = false; + list_t *siblings = container_get_siblings(con); + if (siblings->length > 1 && !container_is_floating(con)) { + if (layout == L_TABBED) { + y_offset = container_titlebar_height(); + view->border_top = false; + } else if (layout == L_STACKED) { + y_offset = container_titlebar_height() * siblings->length; + view->border_top = false; + } } + double x = 0, y = 0, width = 0, height = 0; switch (view->border) { case B_CSD: case B_NONE: diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 27e9ac7a..05cda5c0 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -35,6 +35,10 @@ struct sway_output *workspace_get_initial_output(const char *name) { struct workspace_config *wsc = workspace_find_config(name); if (wsc && wsc->output) { struct sway_output *output = output_by_name(wsc->output); + if (!output) { + output = output_by_identifier(wsc->output); + } + if (output) { return output; } @@ -143,7 +147,11 @@ void workspace_consider_destroy(struct sway_workspace *ws) { static bool workspace_valid_on_output(const char *output_name, const char *ws_name) { struct workspace_config *wsc = workspace_find_config(ws_name); - return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0; + char identifier[128]; + struct sway_output *output = output_by_name(output_name); + output_get_identifier(identifier, sizeof(identifier), output); + + return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0 || strcasecmp(identifier, output_name) == 0; } static void workspace_name_from_binding(const struct sway_binding * binding, |