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

[backends/wayland] ShellSurface opened as a toplevel instead of fullscreen

Browse source 
Going towards nested setup.
This commit is contained in:
Martin Gräßlin 2015-11-16 16:14:10 +01:00
parent eafded7127
commit 3f6cb8812b
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backends/wayland/wayland_backend.cpp
View file

@ -308,7 +308,6 @@ WaylandBackend::~WaylandBackend()
void WaylandBackend::init() void WaylandBackend::init()
{ {
connect(this, &WaylandBackend::shellSurfaceSizeChanged, this, &WaylandBackend::checkBackendReady);
connect(m_registry, &Registry::compositorAnnounced, this, connect(m_registry, &Registry::compositorAnnounced, this,
[this](quint32 name) { [this](quint32 name) {
m_compositor->setup(m_registry->bindCompositor(name, 1)); m_compositor->setup(m_registry->bindCompositor(name, 1));
@ -441,10 +440,11 @@ void WaylandBackend::createSurface()
m_seat->setInstallCursor(true); m_seat->setInstallCursor(true);
} }
if (m_shell->isValid()) { if (m_shell->isValid()) {
// map the surface as fullscreen
m_shellSurface = m_shell->createSurface(m_surface, this); m_shellSurface = m_shell->createSurface(m_surface, this);
m_shellSurface->setFullscreen();
connect(m_shellSurface, &ShellSurface::sizeChanged, this, &WaylandBackend::shellSurfaceSizeChanged); connect(m_shellSurface, &ShellSurface::sizeChanged, this, &WaylandBackend::shellSurfaceSizeChanged);
m_shellSurface->setSize(initialWindowSize());
m_shellSurface->setToplevel();
setReady(true);
} }
} }
@ -456,15 +456,6 @@ QSize WaylandBackend::shellSurfaceSize() const
return QSize(); return QSize();
} }
void WaylandBackend::checkBackendReady()
{
if (!shellSurfaceSize().isValid()) {
return;
}
disconnect(this, &WaylandBackend::shellSurfaceSizeChanged, this, &WaylandBackend::checkBackendReady);
setReady(true);
}
Screens *WaylandBackend::createScreens(QObject *parent) Screens *WaylandBackend::createScreens(QObject *parent)
{ {
return new WaylandScreens(this, parent); return new WaylandScreens(this, parent);

1
backends/wayland/wayland_backend.h
View file

@ -134,7 +134,6 @@ private:
void initConnection(); void initConnection();
void createSurface(); void createSurface();
void destroyOutputs(); void destroyOutputs();
void checkBackendReady();
wl_display *m_display; wl_display *m_display;
KWayland::Client::EventQueue *m_eventQueue; KWayland::Client::EventQueue *m_eventQueue;
KWayland::Client::Registry *m_registry; KWayland::Client::Registry *m_registry;