summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquicksurface.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-07 12:35:44 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:10:33 +0200
commitdfec7314fd3758375e96d4641d2d6b5bec595320 (patch)
tree22cfabe1662b3e45795cd66f80388157490d575f /src/compositor/compositor_api/qwaylandquicksurface.cpp
parentfd9a8983832bbeb240097327ff9f8565f7356b08 (diff)
Remove output from QWaylandSurface
It is the views that belong to outputs. This leads to a couple of interesting cases with enter and leave events, but the implementation says you will get enter events for the first view of a surface entering an output, and for the last view being removed from an output. Also to throttle a surface, there has to be 1 surface which takes care of this. This is because if multiple views throttle, then the client might render to quick. Change-Id: If4bba380fd4d7f506fd769606cbdea4ce58b908d
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquicksurface.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandquicksurface.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index f5399699d..3e5f1c656 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -41,7 +41,6 @@
#include "qwaylandquicksurface.h"
#include "qwaylandquickcompositor.h"
-#include "qwaylandoutput.h"
#include "qwaylandquickitem.h"
#include <QtCompositor/qwaylandbufferref.h>
#include <QtCompositor/QWaylandView>
@@ -67,16 +66,6 @@ public:
{
}
- void surface_commit(Resource *resource) Q_DECL_OVERRIDE
- {
- QWaylandSurfacePrivate::surface_commit(resource);
-
- Q_FOREACH (QWaylandView *view, views) {
- if (view->output())
- view->output()->update();
- }
- }
-
QWaylandQuickCompositor *compositor;
bool useTextureAlpha;
bool clientRenderingEnabled;
@@ -85,7 +74,6 @@ public:
QWaylandQuickSurface::QWaylandQuickSurface(wl_client *client, quint32 id, int version, QWaylandQuickCompositor *compositor)
: QWaylandSurface(new QWaylandQuickSurfacePrivate(client, id, version, compositor, this))
{
- connect(this, &QWaylandSurface::primaryOutputChanged, this, &QWaylandQuickSurface::primaryOutputWindowChanged);
}
QWaylandQuickSurface::~QWaylandQuickSurface()
@@ -109,11 +97,6 @@ void QWaylandQuickSurface::setUseTextureAlpha(bool useTextureAlpha)
}
}
-QWindow *QWaylandQuickSurface::primaryOutputWindow() const
-{
- return primaryOutput() ? primaryOutput()->window() : Q_NULLPTR;
-}
-
bool QWaylandQuickSurface::clientRenderingEnabled() const
{
Q_D(const QWaylandQuickSurface);