From 395e2be6a49badc604aa5eecd7e9d3850e958ae9 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sun, 19 Jun 2016 15:55:30 +0200
Subject: Compositor: consider available geometry when maximizing

Take into account only the portion of output that the compositor
makes available to applications.

Change-Id: Ibe6b1fd94722b42d99ddf133c84d0924461d29f9
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Erik Larsson <erik@ortogonal.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/compositor/extensions/qwaylandxdgshellintegration.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index 7e4d68668..aa3bca8c9 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -130,7 +130,7 @@ void XdgShellIntegration::handleSetMaximized()
     maximizeState.initialPosition = m_item->position();
 
     QWaylandOutput *output = m_item->compositor()->outputs().first();
-    m_xdgSurface->sendMaximized(output->geometry().size() / output->scaleFactor());
+    m_xdgSurface->sendMaximized(output->availableGeometry().size() / output->scaleFactor());
 }
 
 void XdgShellIntegration::handleUnsetMaximized()
@@ -142,7 +142,7 @@ void XdgShellIntegration::handleMaximizedChanged()
 {
     if (m_xdgSurface->maximized()) {
         QWaylandOutput *output = m_item->compositor()->outputs().first();
-        m_item->setPosition(output->geometry().topLeft());
+        m_item->setPosition(output->availableGeometry().topLeft());
     } else {
         m_item->setPosition(maximizeState.initialPosition);
     }
-- 
cgit v1.2.3