mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tree/view: fix smart gaps when ancestor container is tabbed or stacked 

Fixes #5406.
This commit is contained in:
Tudor Brindus 2020-05-31 19:03:42 -04:00 committed by Brian Ashworth
parent 14e887bc3d
commit ed08f2f20c
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sway/tree/view.h
View File

@ -239,11 +239,12 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
bool view_inhibit_idle(struct sway_view *view); bool view_inhibit_idle(struct sway_view *view);
/** /**
* Whether or not the view is the only visible view in its tree. If the view * Whether or not this view's most distant ancestor (possibly itself) is the
* is tiling, there may be floating views. If the view is floating, there may * only visible node in its tree. If the view is tiling, there may be floating
* be tiling views or views in a different floating container. * views. If the view is floating, there may be tiling views or views in a
* different floating container.
*/ */
bool view_is_only_visible(struct sway_view *view); bool view_ancestor_is_only_visible(struct sway_view *view);
/** /**
* Configure the view's position and size based on the container's position and * Configure the view's position and size based on the container's position and

13
sway/tree/view.c
View File

@ -192,21 +192,22 @@ bool view_inhibit_idle(struct sway_view *view) {
|| sway_idle_inhibit_v1_is_active(application_inhibitor); || sway_idle_inhibit_v1_is_active(application_inhibitor);
} }
bool view_is_only_visible(struct sway_view *view) { bool view_ancestor_is_only_visible(struct sway_view *view) {
bool only_view = true; bool only_visible = true;
struct sway_container *con = view->container; struct sway_container *con = view->container;
while (con) { while (con) {
enum sway_container_layout layout = container_parent_layout(con); enum sway_container_layout layout = container_parent_layout(con);
if (layout != L_TABBED && layout != L_STACKED) { if (layout != L_TABBED && layout != L_STACKED) {
list_t *siblings = container_get_siblings(con); list_t *siblings = container_get_siblings(con);
if (siblings && siblings->length > 1) { if (siblings && siblings->length > 1) {
only_view = false; only_visible = false;
break;
} }
} else {
only_visible = true;
} }
con = con->parent; con = con->parent;
} }
return only_view; return only_visible;
} }
static bool gaps_to_edge(struct sway_view *view) { static bool gaps_to_edge(struct sway_view *view) {
@ -247,7 +248,7 @@ void view_autoconfigure(struct sway_view *view) {
bool smart = config->hide_edge_borders_smart == ESMART_ON || bool smart = config->hide_edge_borders_smart == ESMART_ON ||
(config->hide_edge_borders_smart == ESMART_NO_GAPS && (config->hide_edge_borders_smart == ESMART_NO_GAPS &&
!gaps_to_edge(view)); !gaps_to_edge(view));
bool hide_smart = smart && view_is_only_visible(view); bool hide_smart = smart && view_ancestor_is_only_visible(view);
if (config->hide_edge_borders == E_BOTH if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_VERTICAL || hide_smart) { || config->hide_edge_borders == E_VERTICAL || hide_smart) {

2
sway/tree/workspace.c
View File

@ -709,7 +709,7 @@ void workspace_add_gaps(struct sway_workspace *ws) {
if (focus && !focus->view) { if (focus && !focus->view) {
focus = seat_get_focus_inactive_view(seat, &focus->node); focus = seat_get_focus_inactive_view(seat, &focus->node);
} }
if (focus && focus->view && view_is_only_visible(focus->view)) { if (focus && focus->view && view_ancestor_is_only_visible(focus->view)) {
ws->current_gaps.top = 0; ws->current_gaps.top = 0;
ws->current_gaps.right = 0; ws->current_gaps.right = 0;
ws->current_gaps.bottom = 0; ws->current_gaps.bottom = 0;