diff options
| author | Robin Burchell <robin.burchell@viroteck.net> | 2014-08-20 21:34:30 +0200 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@viroteck.net> | 2014-09-23 12:35:34 +0200 |
| commit | 75cda1dcbcd7cddd1bd79218c305bf8814dc460f (patch) | |
| tree | ecb2963d75269ce2097d0018d6aafc84cc10140a /src | |
| parent | 8655435f86b45a343d7a36c35968fa2c7c83f9c3 (diff) | |
decorations: Remove strange set dance between QWaylandWindow & QWaylandAbstractDecoration.
This makes absolutely no sense. Just do things inline.
Change-Id: Ic6d4e62bc9b3c0a4533f63740f2608a0be201047
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/qwaylandabstractdecoration.cpp | 2 | ||||
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 12 | ||||
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/client/qwaylandabstractdecoration.cpp b/src/client/qwaylandabstractdecoration.cpp index e247dbbad..e4b81bb83 100644 --- a/src/client/qwaylandabstractdecoration.cpp +++ b/src/client/qwaylandabstractdecoration.cpp @@ -80,7 +80,6 @@ QWaylandAbstractDecorationPrivate::QWaylandAbstractDecorationPrivate() QWaylandAbstractDecorationPrivate::~QWaylandAbstractDecorationPrivate() { - m_wayland_window->setDecoration(0); } QWaylandAbstractDecoration::QWaylandAbstractDecoration() @@ -103,7 +102,6 @@ void QWaylandAbstractDecoration::setWaylandWindow(QWaylandWindow *window) d->m_window = window->window(); d->m_wayland_window = window; - d->m_wayland_window->setDecoration(this); } const QImage &QWaylandAbstractDecoration::contentImage() diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 2fc904aad..3b1de7f60 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -535,6 +535,9 @@ bool QWaylandWindow::createDecoration() return false; } mWindowDecoration->setWaylandWindow(this); + if (subSurfaceWindow()) { + subSurfaceWindow()->adjustPositionOfChildren(); + } } } else { delete mWindowDecoration; @@ -549,15 +552,6 @@ QWaylandAbstractDecoration *QWaylandWindow::decoration() const return mWindowDecoration; } -// ### can't this go away? we directly set up our decorations, after all -void QWaylandWindow::setDecoration(QWaylandAbstractDecoration *decoration) -{ - mWindowDecoration = decoration; - if (subSurfaceWindow()) { - subSurfaceWindow()->adjustPositionOfChildren(); - } -} - static QWindow *topLevelWindow(QWindow *window) { while (QWindow *parent = window->parent()) diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index c2df0937c..6c32bc3ef 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -145,8 +145,6 @@ public: void unfocus(); QWaylandAbstractDecoration *decoration() const; - void setDecoration(QWaylandAbstractDecoration *decoration); - void handleMouse(QWaylandInputDevice *inputDevice, ulong timestamp, |