view/ssd: Move ssd->enabled to view->ssd_enabled

diff --git a/include/ssd.h b/include/ssd.h
index ca3edb3c5f07dd9da10a57f99ee71d42167aa7bf..21ef6d8791d312003b82b89a4753105742b8e28e 100644 (file)
--- 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 f317dd2b87979cd1c4f2eb17e02162baf683e3b2..cde9ceef8e414fb013be7d5af00d5d8f8848dd57 100644 (file)
--- 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 8b41234180a2592dfe145f32872846e3df3d11a4..6107c3eaccca42f9e6169367dd19c9d53a11578e 100644 (file)
--- 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 9ea1c3b85d95c9a8438a8113e7ba833dfab57c73..71865eee205aca579b69cf4333c491a36bfb81a8 100644 (file)
--- 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 8b76334af79737c8afbf8e186bc407ee2dcaf3d4..f0a4d1a41c1ca52a1ab9b2e36488fdc0a7cec3a8 100644 (file)
--- 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 1aebd01f2ad5db7a396b294a33266e953f5d4de8..9471d13009e7f91d7fcedba7f306f3a74fc2f086 100644 (file)
--- 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);
        }