1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decorations: Remove strange set dance between QWaylandWindow & QWaylandAbstractDecoration.

Browse Source 
This makes absolutely no sense. Just do things inline.

Change-Id: Ic6d4e62bc9b3c0a4533f63740f2608a0be201047
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
This commit is contained in:
Robin Burchell 2014-08-20 21:34:30 +02:00
parent 9dca9722f0
commit 21571bb4fb
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandabstractdecoration.cpp
View File

@ -80,7 +80,6 @@ QWaylandAbstractDecorationPrivate::QWaylandAbstractDecorationPrivate()
QWaylandAbstractDecorationPrivate::~QWaylandAbstractDecorationPrivate() QWaylandAbstractDecorationPrivate::~QWaylandAbstractDecorationPrivate()
{ {
m_wayland_window->setDecoration(0);
} }
QWaylandAbstractDecoration::QWaylandAbstractDecoration() QWaylandAbstractDecoration::QWaylandAbstractDecoration()
@ -103,7 +102,6 @@ void QWaylandAbstractDecoration::setWaylandWindow(QWaylandWindow *window)
d->m_window = window->window(); d->m_window = window->window();
d->m_wayland_window = window; d->m_wayland_window = window;
d->m_wayland_window->setDecoration(this);
} }
const QImage &QWaylandAbstractDecoration::contentImage() const QImage &QWaylandAbstractDecoration::contentImage()

12
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -535,6 +535,9 @@ bool QWaylandWindow::createDecoration()
return false; return false;
} }
mWindowDecoration->setWaylandWindow(this); mWindowDecoration->setWaylandWindow(this);
if (subSurfaceWindow()) {
subSurfaceWindow()->adjustPositionOfChildren();
}
} }
} else { } else {
delete mWindowDecoration; delete mWindowDecoration;
@ -549,15 +552,6 @@ QWaylandAbstractDecoration *QWaylandWindow::decoration() const
return mWindowDecoration; 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) static QWindow *topLevelWindow(QWindow *window)
{ {
while (QWindow *parent = window->parent()) while (QWindow *parent = window->parent())

2
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -145,8 +145,6 @@ public:
void unfocus(); void unfocus();
QWaylandAbstractDecoration *decoration() const; QWaylandAbstractDecoration *decoration() const;
void setDecoration(QWaylandAbstractDecoration *decoration);
void handleMouse(QWaylandInputDevice *inputDevice, void handleMouse(QWaylandInputDevice *inputDevice,
ulong timestamp, ulong timestamp,