yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store Toplevel surface using QPointer

Browse source 
This makes Toplevel::setSurface() simpler.
This commit is contained in:
Vlad Zahorodnii 2021-09-29 11:51:23 +03:00
parent 52c9dbb487
commit 73162e8fae
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/toplevel.cpp
View file

@ -609,6 +609,11 @@ void Toplevel::setSkipCloseAnimation(bool set)
Q_EMIT skipCloseAnimationChanged(); Q_EMIT skipCloseAnimationChanged();
} }
KWaylandServer::SurfaceInterface *Toplevel::surface() const
{
return m_surface;
}
void Toplevel::setSurface(KWaylandServer::SurfaceInterface *surface) void Toplevel::setSurface(KWaylandServer::SurfaceInterface *surface)
{ {
if (m_surface == surface) { if (m_surface == surface) {
@ -616,9 +621,6 @@ void Toplevel::setSurface(KWaylandServer::SurfaceInterface *surface)
} }
m_surface = surface; m_surface = surface;
m_pendingSurfaceId = 0; m_pendingSurfaceId = 0;
connect(m_surface, &KWaylandServer::SurfaceInterface::destroyed, this, [this]() {
m_surface = nullptr;
});
Q_EMIT surfaceChanged(); Q_EMIT surfaceChanged();
} }

8
src/toplevel.h
View file

@ -18,6 +18,7 @@
// Qt // Qt
#include <QObject> #include <QObject>
#include <QMatrix4x4> #include <QMatrix4x4>
#include <QPointer>
#include <QRect> #include <QRect>
#include <QUuid> #include <QUuid>
// c++ // c++
@ -718,7 +719,7 @@ private:
AbstractOutput *m_output = nullptr; AbstractOutput *m_output = nullptr;
bool m_skipCloseAnimation; bool m_skipCloseAnimation;
quint32 m_pendingSurfaceId = 0; quint32 m_pendingSurfaceId = 0;
KWaylandServer::SurfaceInterface *m_surface = nullptr; QPointer<KWaylandServer::SurfaceInterface> m_surface;
// when adding new data members, check also copyToDeleted() // when adding new data members, check also copyToDeleted()
qreal m_screenScale = 1.0; qreal m_screenScale = 1.0;
qreal m_opacity = 1.0; qreal m_opacity = 1.0;
@ -963,11 +964,6 @@ inline quint32 Toplevel::pendingSurfaceId() const
return m_pendingSurfaceId; return m_pendingSurfaceId;
} }
inline KWaylandServer::SurfaceInterface *Toplevel::surface() const
{
return m_surface;
}
inline const QSharedPointer<QOpenGLFramebufferObject> &Toplevel::internalFramebufferObject() const inline const QSharedPointer<QOpenGLFramebufferObject> &Toplevel::internalFramebufferObject() const
{ {
return m_internalFBO; return m_internalFBO;