From b4b68e5bb130bdd858836bada8969af9227a476d Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 1 Mar 2018 01:31:17 +0200 Subject: [PATCH] add wayland debug messages --- app/dock/dockconfigview.cpp | 1 + app/dock/docksecconfigview.cpp | 1 + app/dock/dockview.cpp | 5 +++-- app/dockcorona.cpp | 7 ------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp index f3735b1c5..714e47e80 100644 --- a/app/dock/dockconfigview.cpp +++ b/app/dock/dockconfigview.cpp @@ -400,6 +400,7 @@ bool DockConfigView::event(QEvent *e) if (m_shellSurface) { delete m_shellSurface; m_shellSurface = nullptr; + qDebug() << "WAYLAND config window surface was deleted..."; PanelShadows::self()->removeWindow(this); } diff --git a/app/dock/docksecconfigview.cpp b/app/dock/docksecconfigview.cpp index de0de2723..df468f85a 100644 --- a/app/dock/docksecconfigview.cpp +++ b/app/dock/docksecconfigview.cpp @@ -309,6 +309,7 @@ bool DockSecConfigView::event(QEvent *e) if (m_shellSurface) { delete m_shellSurface; m_shellSurface = nullptr; + qDebug() << "WAYLAND secondary config window surface was deleted..."; PanelShadows::self()->removeWindow(this); } diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index 7e6861e43..00bebc51e 100644 --- a/app/dock/dockview.cpp +++ b/app/dock/dockview.cpp @@ -141,6 +141,7 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen, bool dockWindo DockView::~DockView() { m_inDelete = true; + disconnect(corona(), &Plasma::Corona::availableScreenRectChanged, this, &DockView::availableScreenRectChanged); disconnect(containment(), SIGNAL(statusChanged(Plasma::Types::ItemStatus)), this, SLOT(statusChanged(Plasma::Types::ItemStatus))); @@ -360,7 +361,7 @@ void DockView::setupWaylandIntegration() return; m_shellSurface = interface->createSurface(s, this); - qDebug() << "wayland dock window surface was created..."; + qDebug() << "WAYLAND dock window surface was created..."; m_shellSurface->setSkipTaskbar(true); m_shellSurface->setRole(PlasmaShellSurface::Role::Panel); @@ -1675,7 +1676,7 @@ bool DockView::event(QEvent *e) if (m_shellSurface) { delete m_shellSurface; m_shellSurface = nullptr; - qDebug() << "wayland dock window surface was deleted..."; + qDebug() << "WAYLAND dock window surface was deleted..."; PanelShadows::self()->removeWindow(this); } diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index a8a2e75b8..218b3060a 100644 --- a/app/dockcorona.cpp +++ b/app/dockcorona.cpp @@ -228,13 +228,6 @@ void DockCorona::setupWaylandIntegration() m_waylandDockCorona = registry->createPlasmaShell(name, version, this); }); - /* connect(qApp, &QCoreApplication::aboutToQuit, this, [this, registry]() { - if (m_waylandDockCorona) - m_waylandDockCorona->release(); - - registry->release(); - });*/ - registry->setup(); connection->roundtrip(); }