From: John Lindgren <john@jlindgren.net>
Date: Wed, 15 Feb 2023 18:46:29 +0000 (-0500)
Subject: view: Handle fullscreen also in view_apply_special_geometry()
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=d83e99ff6641bd91b47db6e8a296703d0089e645;p=proto%2Flabwc.git

view: Handle fullscreen also in view_apply_special_geometry()
---

diff --git a/src/view.c b/src/view.c
index 7ac4ea2c..e557ea64 100644
--- a/src/view.c
+++ b/src/view.c
@@ -487,7 +487,9 @@ view_apply_maximized_geometry(struct view *view)
 static bool
 view_apply_special_geometry(struct view *view)
 {
-	if (view->maximized) {
+	if (view->fullscreen) {
+		view_apply_fullscreen_geometry(view);
+	} else if (view->maximized) {
 		view_apply_maximized_geometry(view);
 	} else if (view->tiled) {
 		view_apply_tiled_geometry(view, NULL);
@@ -729,13 +731,8 @@ view_set_fullscreen(struct view *view, bool fullscreen, struct output *output)
 	}
 
 	set_fullscreen(view, fullscreen);
-	if (fullscreen) {
-		view_apply_fullscreen_geometry(view);
-	} else {
-		/* Restore non-fullscreen geometry */
-		if (!view_apply_special_geometry(view)) {
-			view_apply_natural_geometry(view);
-		}
+	if (!view_apply_special_geometry(view)) {
+		view_apply_natural_geometry(view);
 	}
 }