diff options
| author | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-06-19 15:55:30 +0200 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> | 2016-07-01 08:11:25 +0000 |
| commit | 395e2be6a49badc604aa5eecd7e9d3850e958ae9 (patch) | |
| tree | eb899de107793ddda97d47e9653369bca6f8cb6f | |
| parent | 582c6b8ce4adeff995ad648f299cadaa5c9fd90d (diff) | |
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>
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellintegration.cpp | 4 |
1 files 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); } |