From 5233a0bd2ef84ab6d1eeb2ebcde3d0c73794cdb9 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Thu, 28 Dec 2023 23:28:27 +0200
Subject: [PATCH] ipc: properly check for titlebars

This fixes incorrect values for rect.y when using
`hide_edge_borders --i3`.
---
 sway/ipc-json.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 1ee391246..91e31a298 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -578,9 +578,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 	bool visible = view_is_visible(c->view);
 	json_object_object_add(object, "visible", json_object_new_boolean(visible));
 
+	bool has_titlebar = c->title_bar.tree->node.enabled;
 	struct wlr_box window_box = {
 		c->pending.content_x - c->pending.x,
-		(c->current.border == B_PIXEL) ? c->pending.content_y - c->pending.y : 0,
+		has_titlebar ? 0 : c->pending.content_y - c->pending.y,
 		c->pending.content_width,
 		c->pending.content_height
 	};