summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2016-06-19 16:10:28 +0200
committerPier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>2016-07-01 08:18:52 +0000
commit09aa17e0a85cdd85f0ebf80e5344e44e7db3c83c (patch)
treeef525ee7d7457b78ad0ec6f800d36dd1bd838608
parent395e2be6a49badc604aa5eecd7e9d3850e958ae9 (diff)
Compositor: maximize on the output where the item is rendered
Change-Id: I2ab66ee3185322674c5f9fa580659807aa6731ae 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.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index aa3bca8c9..41d559e4d 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -129,7 +129,7 @@ void XdgShellIntegration::handleSetMaximized()
maximizeState.initialWindowSize = m_xdgSurface->windowGeometry().size();
maximizeState.initialPosition = m_item->position();
- QWaylandOutput *output = m_item->compositor()->outputs().first();
+ QWaylandOutput *output = m_item->view()->output();
m_xdgSurface->sendMaximized(output->availableGeometry().size() / output->scaleFactor());
}
@@ -141,7 +141,7 @@ void XdgShellIntegration::handleUnsetMaximized()
void XdgShellIntegration::handleMaximizedChanged()
{
if (m_xdgSurface->maximized()) {
- QWaylandOutput *output = m_item->compositor()->outputs().first();
+ QWaylandOutput *output = m_item->view()->output();
m_item->setPosition(output->availableGeometry().topLeft());
} else {
m_item->setPosition(maximizeState.initialPosition);