diff --git a/backends/wayland/wayland_backend.cpp b/backends/wayland/wayland_backend.cpp index d7c6ea2cff..bbf4b9f830 100644 --- a/backends/wayland/wayland_backend.cpp +++ b/backends/wayland/wayland_backend.cpp @@ -32,7 +32,6 @@ along with this program. If not, see . #include #include #include -#include #include #include #include @@ -348,7 +347,6 @@ WaylandBackend::WaylandBackend(QObject *parent) , m_shm(new ShmPool(this)) , m_connectionThreadObject(new ConnectionThread(nullptr)) , m_connectionThread(nullptr) - , m_fullscreenShell(new FullscreenShell(this)) , m_subCompositor(new SubCompositor(this)) , m_cursor(nullptr) { @@ -362,7 +360,6 @@ WaylandBackend::~WaylandBackend() if (m_shellSurface) { m_shellSurface->release(); } - m_fullscreenShell->release(); if (m_surface) { m_surface->release(); } @@ -414,11 +411,6 @@ void WaylandBackend::init() m_shm->setup(m_registry->bindShm(name, 1)); } ); - connect(m_registry, &Registry::fullscreenShellAnnounced, this, - [this](quint32 name, quint32 version) { - m_fullscreenShell->setup(m_registry->bindFullscreenShell(name, version)); - } - ); connect(m_registry, &Registry::subCompositorAnnounced, this, [this](quint32 name, quint32 version) { m_subCompositor->setup(m_registry->bindSubCompositor(name, version)); @@ -460,7 +452,6 @@ void WaylandBackend::initConnection() delete m_shellSurface; m_shellSurface = nullptr; } - m_fullscreenShell->destroy(); if (m_surface) { m_surface->destroy(); delete m_surface; @@ -535,20 +526,7 @@ void WaylandBackend::createSurface() m_seat->setInstallCursor(true); } } - if (m_fullscreenShell->isValid()) { - Output *o = m_outputs.first(); - m_fullscreenShell->present(m_surface, o); - if (o->pixelSize().isValid()) { - emit shellSurfaceSizeChanged(o->pixelSize()); - } - connect(o, &Output::changed, this, - [this, o]() { - if (o->pixelSize().isValid()) { - emit shellSurfaceSizeChanged(o->pixelSize()); - } - } - ); - } else if (m_shell->isValid()) { + if (m_shell->isValid()) { // map the surface as fullscreen m_shellSurface = m_shell->createSurface(m_surface, this); m_shellSurface->setFullscreen(); @@ -561,9 +539,6 @@ QSize WaylandBackend::shellSurfaceSize() const if (m_shellSurface) { return m_shellSurface->size(); } - if (m_fullscreenShell->isValid()) { - return m_outputs.first()->pixelSize(); - } return QSize(); } diff --git a/backends/wayland/wayland_backend.h b/backends/wayland/wayland_backend.h index c0d58d2551..6ac278ddb2 100644 --- a/backends/wayland/wayland_backend.h +++ b/backends/wayland/wayland_backend.h @@ -45,7 +45,6 @@ class ShmPool; class Compositor; class ConnectionThread; class EventQueue; -class FullscreenShell; class Keyboard; class Output; class Pointer; @@ -175,7 +174,6 @@ private: QList m_outputs; KWayland::Client::ConnectionThread *m_connectionThreadObject; QThread *m_connectionThread; - KWayland::Client::FullscreenShell *m_fullscreenShell; KWayland::Client::SubCompositor *m_subCompositor; WaylandCursor *m_cursor; };