From 56f8837ca60dd19e395e38610ff543994c0e5ff0 Mon Sep 17 00:00:00 2001
From: John Lindgren <john@jlindgren.net>
Date: Mon, 21 Nov 2022 15:38:20 -0500
Subject: [PATCH] view/ssd: Move ssd->enabled to view->ssd_enabled

---
 include/ssd.h  | 1 -
 include/view.h | 1 +
 src/server.c   | 2 +-
 src/ssd/ssd.c  | 4 ++--
 src/view.c     | 8 ++++----
 src/xwayland.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/ssd.h b/include/ssd.h
index ca3edb3c..21ef6d87 100644
--- a/include/ssd.h
+++ b/include/ssd.h
@@ -81,7 +81,6 @@ struct ssd_state_title_width {
 };
 
 struct ssd {
-	bool enabled;
 	struct wlr_scene_tree *tree;
 
 	/*
diff --git a/include/view.h b/include/view.h
index f317dd2b..cde9ceef 100644
--- a/include/view.h
+++ b/include/view.h
@@ -48,6 +48,7 @@ struct view {
 
 	bool mapped;
 	bool been_mapped;
+	bool ssd_enabled;
 	bool minimized;
 	bool maximized;
 	uint32_t tiled;  /* private, enum view_edge in src/view.c */
diff --git a/src/server.c b/src/server.c
index 8b412341..6107c3ea 100644
--- a/src/server.c
+++ b/src/server.c
@@ -40,7 +40,7 @@ reload_config_and_theme(void)
 
 	struct view *view;
 	wl_list_for_each(view, &g_server->views, link) {
-		if (!view->mapped || !view->ssd.enabled) {
+		if (!view->mapped || !view->ssd_enabled) {
 			continue;
 		}
 		ssd_reload(view);
diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 9ea1c3b8..71865eee 100644
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -16,7 +16,7 @@
 struct border
 ssd_thickness(struct view *view)
 {
-	if (!view->ssd.enabled) {
+	if (!view->ssd_enabled) {
 		struct border border = { 0 };
 		return border;
 	}
@@ -172,7 +172,7 @@ ssd_update_geometry(struct view *view)
 		return;
 	}
 
-	if (!view->ssd.enabled) {
+	if (!view->ssd_enabled) {
 		if (view->ssd.tree && view->ssd.tree->node.enabled) {
 			wlr_scene_node_set_enabled(&view->ssd.tree->node, false);
 			view->ssd.margin = ssd_thickness(view);
diff --git a/src/view.c b/src/view.c
index 8b76334a..f0a4d1a4 100644
--- a/src/view.c
+++ b/src/view.c
@@ -404,7 +404,7 @@ view_apply_maximized_geometry(struct view *view)
 		box.width /= output->wlr_output->scale;
 	}
 
-	if (view->ssd.enabled) {
+	if (view->ssd_enabled) {
 		struct border border = ssd_thickness(view);
 		box.x += border.left;
 		box.y += border.top;
@@ -514,7 +514,7 @@ void
 view_toggle_decorations(struct view *view)
 {
 	assert(view);
-	view_set_decorations(view, !view->ssd.enabled);
+	view_set_decorations(view, !view->ssd_enabled);
 }
 
 static bool
@@ -554,8 +554,8 @@ void
 view_set_decorations(struct view *view, bool decorations)
 {
 	assert(view);
-	if (view->ssd.enabled != decorations && !view->fullscreen) {
-		view->ssd.enabled = decorations;
+	if (view->ssd_enabled != decorations && !view->fullscreen) {
+		view->ssd_enabled = decorations;
 		ssd_update_geometry(view);
 		if (view->maximized) {
 			view_apply_maximized_geometry(view);
diff --git a/src/xwayland.c b/src/xwayland.c
index 1aebd01f..9471d130 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -400,7 +400,7 @@ map(struct view *view)
 		view->been_mapped = true;
 	}
 
-	if (view->ssd.enabled && !view->fullscreen && !view->maximized) {
+	if (view->ssd_enabled && !view->fullscreen && !view->maximized) {
 		top_left_edge_boundary_check(view);
 	}
 
-- 
2.52.0