From fd236f33cdc229e278ced353b91464265dd8fffa Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Sun, 26 Nov 2017 22:33:33 -0800
Subject: [PATCH] BWindow: Update Zoom() with Deskbar window flags

Call newly created BDeskbar methods to adjust default Zoom().

if auto-hide is turned on don't consider Deskbar's frame.

In vertical mode allow windows to zoom on top of Deskbar if
auto-raise or always on top is turned on.

Deskbar can take up a significant area so you can reclaim that
space by turning on auto-raise or always on top.

In horizontal mode ignore auto-raise and always on top settings,
don't allow windows to zoom on top of Deskbar even if these
settings are turned on.

Deskbar doesn't take up very much space and you don't want your
window to get cut-off at the bottom.
---
 src/kits/interface/Window.cpp | 39 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 0914b91c0d..1eef529bc3 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1703,28 +1703,33 @@ BWindow::Zoom()
 
 	BRect zoomArea = screenFrame; // starts at screen size
 
-	// remove area taken up by Deskbar
 	BDeskbar deskbar;
 	BRect deskbarFrame = deskbar.Frame();
-	switch (deskbar.Location()) {
-		case B_DESKBAR_TOP:
-			zoomArea.top = deskbarFrame.bottom + 2;
-			break;
+	if (!deskbar.IsAutoHide()) {
+		// remove area taken up by Deskbar (if not auto-hidden)
+		switch (deskbar.Location()) {
+			case B_DESKBAR_TOP:
+				zoomArea.top = deskbarFrame.bottom + 2;
+				break;
 
-		case B_DESKBAR_BOTTOM:
-			zoomArea.bottom = deskbarFrame.top - 2;
-			break;
+			case B_DESKBAR_BOTTOM:
+				zoomArea.bottom = deskbarFrame.top - 2;
+				break;
 
-		case B_DESKBAR_LEFT_TOP:
-		case B_DESKBAR_LEFT_BOTTOM:
-			zoomArea.left = deskbarFrame.right + 2;
-			break;
+			// in vertical mode, only if not always on top and not auto-raise
+			case B_DESKBAR_LEFT_TOP:
+			case B_DESKBAR_LEFT_BOTTOM:
+				if (!deskbar.IsAlwaysOnTop() && !deskbar.IsAutoRaise())
+					zoomArea.left = deskbarFrame.right + 2;
+				break;
 
-		default:
-		case B_DESKBAR_RIGHT_TOP:
-		case B_DESKBAR_RIGHT_BOTTOM:
-			zoomArea.right = deskbarFrame.left - 2;
-			break;
+			default:
+			case B_DESKBAR_RIGHT_TOP:
+			case B_DESKBAR_RIGHT_BOTTOM:
+				if (!deskbar.IsAlwaysOnTop() && !deskbar.IsAutoRaise())
+					zoomArea.right = deskbarFrame.left - 2;
+				break;
+		}
 	}
 
 	// TODO: Broken for tab on left side windows...