From 95c5d8d7b590c71cdcda8a6aac106ad731b69638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Adamczak?=
 <14021+czak@users.noreply.github.com>
Date: Sun, 5 Feb 2023 14:54:09 +0100
Subject: [PATCH] Correct window_rect.y with hide_edge_borders

With `hide_edge_borders both` (or at least `vertical`),
`window_rect.y` will equal `border_thickness` for SOME windows,
but it will be 0 for windows adjacent to top screen edge.

Therefore setting it to `border_thickness` is not sufficient.

This commit changes it to the actual y offset of content
into the container.

(cherry picked from commit fadfbe8dbae4b3a840cc05fcfe67d74f5050a878)
---
 sway/ipc-json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index d757f21f..cd79e1c8 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -558,7 +558,7 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
 
 	struct wlr_box window_box = {
 		c->pending.content_x - c->pending.x,
-		(c->current.border == B_PIXEL) ? c->current.border_thickness : 0,
+		(c->current.border == B_PIXEL) ? c->pending.content_y - c->pending.y : 0,
 		c->pending.content_width,
 		c->pending.content_height
 	};