Use useable output area for maximize

BuddiesOfBudgie · Oct 13, 2023 · 50cb351 · 50cb351
1 parent 7a354d7
commit 50cb351
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/output.cpp b/src/output.cpp
@@ -96,3 +96,13 @@ void Output::update_layout() {
 		wlr_scene_layer_surface_v1_configure(layer->scene_layer_surface, &full_area, &usable_area);
 	}
 }
+
+wlr_box Output::usable_area_in_layout_coords() const {
+	double layout_x = 0, layout_y = 0;
+	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;
+	return box;
+}
diff --git a/src/output.hpp b/src/output.hpp
@@ -39,6 +39,7 @@ class Output {
 	~Output() noexcept;
 
 	void update_layout();
+	wlr_box usable_area_in_layout_coords() const;
 };
 
 #endif
diff --git a/src/surface/view.cpp b/src/surface/view.cpp
@@ -130,13 +130,12 @@ void View::set_maximized(const bool maximized) {
 		previous.x = current.x;
 		previous.y = current.y;
 
-		wlr_box output_box = current;
-
 		auto best_output = find_output_for_maximize();
-		if (best_output.has_value()) {
-			wlr_output_layout_get_box(server.output_layout, best_output.value()->output, &output_box);
+		if (!best_output.has_value()) {
+			return;
 		}
 
+		wlr_box output_box = best_output.value()->usable_area_in_layout_coords();
 		set_size(output_box.width, output_box.height);
 		impl_set_maximized(true);
 		current.x = output_box.x;