Fix initial centering XDG windows on multiple monitors

BuddiesOfBudgie · Oct 29, 2023 · c8a0e7f · c8a0e7f
1 parent a336c85
commit c8a0e7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/output.cpp b/src/output.cpp
@@ -100,7 +100,7 @@ wlr_box Output::usable_area_in_layout_coords() const {
 	wlr_output_layout_output_coords(server.output_layout, output, &layout_x, &layout_y);
 
 	wlr_box box = usable_area;
-	box.x -= layout_x;
-	box.y -= layout_y;
+	box.x += layout_x;
+	box.y += layout_y;
 	return box;
 }
diff --git a/src/surface/view.hpp b/src/surface/view.hpp
@@ -70,7 +70,7 @@ class XdgView : public View {
 
   private:
 	Listeners listeners;
-	bool never_mapped;
+	bool pending_map = true;
 
   public:
 	Server& server;

diff --git a/src/surface/xdg_view.cpp b/src/surface/xdg_view.cpp
@@ -127,8 +127,6 @@ XdgView::XdgView(Server& server, wlr_xdg_toplevel& toplevel) noexcept
 	scene_node = &scene_tree->node;
 	surface = toplevel.base->surface;
 
-	never_mapped = true;
-
 	wlr_xdg_toplevel_set_wm_capabilities(
 		&toplevel, WLR_XDG_TOPLEVEL_WM_CAPABILITIES_MAXIMIZE | WLR_XDG_TOPLEVEL_WM_CAPABILITIES_MINIMIZE);
 
@@ -197,7 +195,7 @@ const wlr_box XdgView::get_geometry() const {
 }
 
 void XdgView::map() {
-	if (never_mapped) {
+	if (pending_map) {
 		previous = {0, 0, 0, 0};
 		wlr_xdg_surface_get_geometry(xdg_toplevel.base, &current);
 
@@ -209,7 +207,7 @@ void XdgView::map() {
 			set_position(center_x - (current.width / 2), center_y - (current.height / 2));
 		}
 
-		never_mapped = false;
+		pending_map = false;
 	}
 
 	wlr_scene_node_set_enabled(scene_node, true);