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

tree/view: fix smart borders with tabbed/stacked ancestor

Browse source 
Fixes #5484.
This commit is contained in:
Tudor Brindus 2020-06-26 20:12:28 -04:00 committed by Brian Ashworth
parent c822427091
commit bb85b9070d
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sway/tree/view.c
View file

@ -211,6 +211,23 @@ bool view_ancestor_is_only_visible(struct sway_view *view) {
return only_visible; return only_visible;
} }
static bool view_is_only_visible(struct sway_view *view) {
struct sway_container *con = view->container;
while (con) {
enum sway_container_layout layout = container_parent_layout(con);
if (layout != L_TABBED && layout != L_STACKED) {
list_t *siblings = container_get_siblings(con);
if (siblings && siblings->length > 1) {
return false;
}
}
con = con->parent;
}
return true;
}
static bool gaps_to_edge(struct sway_view *view) { static bool gaps_to_edge(struct sway_view *view) {
struct side_gaps gaps = view->container->workspace->current_gaps; struct side_gaps gaps = view->container->workspace->current_gaps;
return gaps.top > 0 || gaps.right > 0 || gaps.bottom > 0 || gaps.left > 0; return gaps.top > 0 || gaps.right > 0 || gaps.bottom > 0 || gaps.left > 0;
@ -245,25 +262,31 @@ void view_autoconfigure(struct sway_view *view) {
double y_offset = 0; double y_offset = 0;
if (!container_is_floating(con) && ws) { if (!container_is_floating(con) && ws) {
bool smart = config->hide_edge_borders_smart == ESMART_ON ||
(config->hide_edge_borders_smart == ESMART_NO_GAPS &&
!gaps_to_edge(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) {
con->border_left = con->x != ws->x; con->border_left = con->x != ws->x;
int right_x = con->x + con->width; int right_x = con->x + con->width;
con->border_right = right_x != ws->x + ws->width; con->border_right = right_x != ws->x + ws->width;
} }
if (config->hide_edge_borders == E_BOTH if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_HORIZONTAL || hide_smart) { || config->hide_edge_borders == E_HORIZONTAL) {
con->border_top = con->y != ws->y; con->border_top = con->y != ws->y;
int bottom_y = con->y + con->height; int bottom_y = con->y + con->height;
con->border_bottom = bottom_y != ws->y + ws->height; con->border_bottom = bottom_y != ws->y + ws->height;
} }
bool smart = config->hide_edge_borders_smart == ESMART_ON ||
(config->hide_edge_borders_smart == ESMART_NO_GAPS &&
!gaps_to_edge(view));
if (smart) {
bool show_border = !view_is_only_visible(view);
con->border_left &= show_border;
con->border_right &= show_border;
con->border_top &= show_border;
con->border_bottom &= show_border;
}
// In a tabbed or stacked container, the container's y is the top of the // 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, // 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. // bar, and disable any top border because we'll always have the title bar.