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

Fix hide_edge_borders constraints

Browse source 
When checking if a border is on the edge, the check should be done
against the workspace rather than the output.
This commit is contained in:
Ryan Dwyer 2018-05-21 13:10:52 +10:00
parent a9733d96f9
commit c4ea2b51f6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/tree/view.c
View file

@ -139,9 +139,10 @@ void view_autoconfigure(struct sway_view *view) {
return; return;
} }
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
int other_views = 1; int other_views = 1;
if (config->hide_edge_borders == E_SMART) { if (config->hide_edge_borders == E_SMART) {
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
} }
@ -151,16 +152,16 @@ void view_autoconfigure(struct sway_view *view) {
if (config->hide_edge_borders == E_BOTH if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_VERTICAL
|| (config->hide_edge_borders == E_SMART && !other_views)) { || (config->hide_edge_borders == E_SMART && !other_views)) {
view->border_left = view->swayc->x != 0; view->border_left = view->swayc->x != ws->x;
int right_x = view->swayc->x + view->swayc->width; int right_x = view->swayc->x + view->swayc->width;
view->border_right = right_x != output->width; view->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 || config->hide_edge_borders == E_HORIZONTAL
|| (config->hide_edge_borders == E_SMART && !other_views)) { || (config->hide_edge_borders == E_SMART && !other_views)) {
view->border_top = view->swayc->y != 0; view->border_top = view->swayc->y != ws->y;
int bottom_y = view->swayc->y + view->swayc->height; int bottom_y = view->swayc->y + view->swayc->height;
view->border_bottom = bottom_y != output->height; view->border_bottom = bottom_y != ws->y + ws->height;
} }
} }