From 76bdb21ca9ea377a8196a33adfcd3077fbcc57c5 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 19 Aug 2018 21:09:39 +1000
Subject: [PATCH] Fix popup position when parent uses geometry

Fixes #2489.
---
 sway/desktop/output.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 2253eb51..3d8bbff5 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -163,8 +163,10 @@ void output_view_for_each_popup(struct sway_output *output,
 		.user_iterator = iterator,
 		.user_data = user_data,
 		.output = output,
-		.ox = view->swayc->current.view_x - output->swayc->current.swayc_x,
-		.oy = view->swayc->current.view_y - output->swayc->current.swayc_y,
+		.ox = view->swayc->current.view_x - output->swayc->current.swayc_x
+			- view->geometry.x,
+		.oy = view->swayc->current.view_y - output->swayc->current.swayc_y
+			- view->geometry.y,
 		.width = view->swayc->current.view_width,
 		.height = view->swayc->current.view_height,
 		.rotation = 0, // TODO