hrev53957 adds 1 changeset to branch 'master'
old head: 2deffe2f3f3d5f6a48cdc67bf423ff6f2af4c092
new head: ddb8a390057f08a6abb0de505c799a1089410a59
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ddb8a390057f+%5E2deffe2f3f3d
----------------------------------------------------------------------------
ddb8a390057f: BWindow: Adjust default zoom for new mini-mode
Treat bottom left, bottom right, and top left mini-mode like
horizontal mode and go full screen in top right mini-mode.
Change-Id: I55c4c0875b5696e6c193a72d96f309c3b058bf9c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2254
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53957
Commit: ddb8a390057f08a6abb0de505c799a1089410a59
URL: https://git.haiku-os.org/haiku/commit/?id=ddb8a390057f
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Wed Feb 19 00:45:29 2020 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Mon Mar 9 12:11:21 2020 UTC
----------------------------------------------------------------------------
1 file changed, 9 insertions(+), 5 deletions(-)
src/kits/interface/Window.cpp | 14 +++++++++-----
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 3f27e5ea55..4af569f81b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1569,20 +1569,24 @@ BWindow::Zoom()
break;
case B_DESKBAR_BOTTOM:
+ case B_DESKBAR_LEFT_BOTTOM:
+ case B_DESKBAR_RIGHT_BOTTOM:
zoomArea.bottom = deskbarFrame.top - 2;
break;
- // in vertical mode, only if not always on top and not
auto-raise
+ // in vertical expando mode only if not always-on-top
or auto-raise
case B_DESKBAR_LEFT_TOP:
- case B_DESKBAR_LEFT_BOTTOM:
- if (!deskbar.IsAlwaysOnTop() &&
!deskbar.IsAutoRaise())
+ if (!deskbar.IsExpanded())
+ zoomArea.top = deskbarFrame.bottom + 2;
+ else if (!deskbar.IsAlwaysOnTop() &&
!deskbar.IsAutoRaise())
zoomArea.left = deskbarFrame.right + 2;
break;
default:
case B_DESKBAR_RIGHT_TOP:
- case B_DESKBAR_RIGHT_BOTTOM:
- if (!deskbar.IsAlwaysOnTop() &&
!deskbar.IsAutoRaise())
+ if (!deskbar.IsExpanded())
+ break;
+ else if (!deskbar.IsAlwaysOnTop() &&
!deskbar.IsAutoRaise())
zoomArea.right = deskbarFrame.left - 2;
break;
}
