From kde-commits Wed Feb 28 23:31:41 2018 From: Michail Vourlakos Date: Wed, 28 Feb 2018 23:31:41 +0000 To: kde-commits Subject: [latte-dock] app: add wayland debug messages Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=151986071521757 Git commit b4b68e5bb130bdd858836bada8969af9227a476d by Michail Vourlakos. Committed on 28/02/2018 at 23:31. Pushed by mvourlakos into branch 'master'. add wayland debug messages M +1 -0 app/dock/dockconfigview.cpp M +1 -0 app/dock/docksecconfigview.cpp M +3 -2 app/dock/dockview.cpp M +0 -7 app/dockcorona.cpp https://commits.kde.org/latte-dock/b4b68e5bb130bdd858836bada8969af9227a476d diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp index f3735b1..714e47e 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 =3D nullptr; + qDebug() << "WAYLAND config window surface was del= eted..."; PanelShadows::self()->removeWindow(this); } = diff --git a/app/dock/docksecconfigview.cpp b/app/dock/docksecconfigview.cpp index de0de27..df468f8 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 =3D nullptr; + qDebug() << "WAYLAND secondary config window surfa= ce was deleted..."; PanelShadows::self()->removeWindow(this); } = diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index 7e6861e..00bebc5 100644 --- a/app/dock/dockview.cpp +++ b/app/dock/dockview.cpp @@ -141,6 +141,7 @@ DockView::DockView(Plasma::Corona *corona, QScreen *tar= getScreen, bool dockWindo DockView::~DockView() { m_inDelete =3D true; + disconnect(corona(), &Plasma::Corona::availableScreenRectChanged, this= , &DockView::availableScreenRectChanged); disconnect(containment(), SIGNAL(statusChanged(Plasma::Types::ItemStat= us)), this, SLOT(statusChanged(Plasma::Types::ItemStatus))); = @@ -360,7 +361,7 @@ void DockView::setupWaylandIntegration() return; = m_shellSurface =3D 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 =3D nullptr; - qDebug() << "wayland dock window surface w= as deleted..."; + qDebug() << "WAYLAND dock window surface w= as deleted..."; PanelShadows::self()->removeWindow(this); } = diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index a8a2e75..218b306 100644 --- a/app/dockcorona.cpp +++ b/app/dockcorona.cpp @@ -228,13 +228,6 @@ void DockCorona::setupWaylandIntegration() m_waylandDockCorona =3D registry->createPlasmaShell(name, version,= this); }); = - /* connect(qApp, &QCoreApplication::aboutToQuit, this, [this, registry= ]() { - if (m_waylandDockCorona) - m_waylandDockCorona->release(); - - registry->release(); - });*/ - registry->setup(); connection->roundtrip(); }