]> git.mdlowis.com Git - proto/labwc.git/commitdiff
view: get the closest wlr_output in view_wlr_output()
authorARDiDo <90479315+ARDiDo@users.noreply.github.com>
Sat, 13 Nov 2021 17:09:40 +0000 (12:09 -0500)
committerARDiDo <90479315+ARDiDo@users.noreply.github.com>
Sat, 13 Nov 2021 17:09:40 +0000 (12:09 -0500)
src/view.c

index b330b900a1d398cc881c200d056bdec77a144708..1e560e8e9ad5078b850c7b25ee443ca6f6440c05 100644 (file)
@@ -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);
 }