summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-07-30 12:05:12 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:09:41 +0200
commitab6980d57609b1e4bdb164d3413faa2f7cb7e1e4 (patch)
treeef68f66511347c0545559df6a81b6d56c6448eb4 /src/imports
parente88c2f37097901e228de70c62a0220386038a51a (diff)
downloadqtwayland-ab6980d57609b1e4bdb164d3413faa2f7cb7e1e4.tar.gz
Move the output from QWaylandSurface to the QWaylandSurfaceView
and add a property called primaryOutput on the QWaylandSurface. Also add some bookkeeping in QtWayland::Output so it knows what surfaces and views it currently holds, sending the enter and leave events automatically. Change-Id: Ib6efbc6f8157657fb4451b751bba1cb5345b7906
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/compositor/WaylandSurfaceChrome.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/compositor/WaylandSurfaceChrome.qml b/src/imports/compositor/WaylandSurfaceChrome.qml
index 69525d87..7f9ae802 100644
--- a/src/imports/compositor/WaylandSurfaceChrome.qml
+++ b/src/imports/compositor/WaylandSurfaceChrome.qml
@@ -60,7 +60,6 @@ Item {
}
onSurfaceDestroyed: {
- chrome.surfaceDestroyed();
if (automaticDestroyOnSurfaceDestroy)
chrome.destroy();
}
@@ -78,6 +77,7 @@ Item {
chrome.visible = Qt.binding(function() { return view.visible; });
chrome.requestedXPosition = Qt.binding(function() { return view.requestedXPosition; });
chrome.requestedYPosition = Qt.binding(function() { return view.requestedYPosition; });
+ view.surfaceDestroyed.connect(function() { chrome.surfaceDestroyed(); });
} else {
chrome.visible = false;
}