From 2adf23c2a3b80f19fd5e9114192a3dbb88ade2be Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Sat, 12 May 2018 12:56:26 -0400
Subject: Only count views for hide_edge_borders smart
---
sway/desktop/output.c | 14 ++++++++++----
sway/tree/view.c | 7 +++++--
2 files changed, 15 insertions(+), 6 deletions(-)
(limited to 'sway')
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index b99e9a91..974cd56c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -322,8 +322,11 @@ static void render_container_simple_border_normal(struct sway_output *output,
struct wlr_box box;
float color[4];
- struct sway_container *ws = container_parent(con, C_WORKSPACE);
- int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+ int other_views = 1;
+ if (config->hide_edge_borders == E_SMART) {
+ struct sway_container *ws = container_parent(con, C_WORKSPACE);
+ other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+ }
if (config->hide_edge_borders != E_VERTICAL
&& 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;
float color[4];
- struct sway_container *ws = container_parent(con, C_WORKSPACE);
- int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+ int other_views = 1;
+ if (config->hide_edge_borders == E_SMART) {
+ struct sway_container *ws = container_parent(con, C_WORKSPACE);
+ other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+ }
if (config->hide_edge_borders != E_VERTICAL
&& config->hide_edge_borders != E_BOTH
diff --git a/sway/tree/view.c b/sway/tree/view.c
index ae8709ba..e2cb8a7a 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -100,8 +100,11 @@ void view_autoconfigure(struct sway_view *view) {
return;
}
- struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
- int other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
+ int other_views = 1;
+ 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;
+ }
double x, y, width, height;
x = y = width = height = 0;
--
cgit v1.2.3