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

Only count views for hide_edge_borders smart

Browse source
This commit is contained in:
Brian Ashworth 2018-05-12 12:56:26 -04:00
parent ec60e24f75
commit 2adf23c2a3
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/desktop/output.c
View file

@ -322,8 +322,11 @@ static void render_container_simple_border_normal(struct sway_output *output,
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
int other_views = 1;
if (config->hide_edge_borders == E_SMART) {
struct sway_container *ws = container_parent(con, C_WORKSPACE); struct sway_container *ws = container_parent(con, C_WORKSPACE);
int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
}
if (config->hide_edge_borders != E_VERTICAL if (config->hide_edge_borders != E_VERTICAL
&& config->hide_edge_borders != E_BOTH && config->hide_edge_borders != E_BOTH
@ -424,8 +427,11 @@ static void render_container_simple_border_pixel(struct sway_output *output,
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
int other_views = 1;
if (config->hide_edge_borders == E_SMART) {
struct sway_container *ws = container_parent(con, C_WORKSPACE); struct sway_container *ws = container_parent(con, C_WORKSPACE);
int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
}
if (config->hide_edge_borders != E_VERTICAL if (config->hide_edge_borders != E_VERTICAL
&& config->hide_edge_borders != E_BOTH && config->hide_edge_borders != E_BOTH

5
sway/tree/view.c
View file

@ -100,8 +100,11 @@ void view_autoconfigure(struct sway_view *view) {
return; return;
} }
int other_views = 1;
if (config->hide_edge_borders == E_SMART) {
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1; other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
}
double x, y, width, height; double x, y, width, height;
x = y = width = height = 0; x = y = width = height = 0;