From: ARDiDo <90479315+ARDiDo@users.noreply.github.com>
Date: Sat, 13 Nov 2021 17:09:40 +0000 (-0500)
Subject: view: get the closest wlr_output in view_wlr_output()
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=a54e0fb4b6d6765c52dce06174d0bf7b51899530;p=proto%2Flabwc.git

view: get the closest wlr_output in view_wlr_output()
---

diff --git a/src/view.c b/src/view.c
index b330b900..1e560e8e 100644
--- a/src/view.c
+++ b/src/view.c
@@ -79,8 +79,9 @@ view_minimize(struct view *view, bool minimized)
 	}
 }
 
-static struct wlr_output *
-view_closest_wlr_output(struct view *view)
+/* view_wlr_output - return the output that a view is mostly on */
+struct wlr_output *
+view_wlr_output(struct view *view)
 {
 	double closest_x, closest_y;
 	struct wlr_output *wlr_output = NULL;
@@ -92,21 +93,10 @@ view_closest_wlr_output(struct view *view)
 	return wlr_output;
 }
 
-/* view_wlr_output - return the output that a view is mostly on */
-struct wlr_output *
-view_wlr_output(struct view *view)
-{
-	return wlr_output_layout_output_at(view->server->output_layout,
-		view->x + view->w / 2, view->y + view->h / 2);
-}
-
 static struct output *
 view_output(struct view *view)
 {
 	struct wlr_output *wlr_output = view_wlr_output(view);
-	if (!wlr_output) {
-		wlr_output = view_closest_wlr_output(view);
-	}
 	return output_from_wlr_output(view->server, wlr_output);
 }