From f7693cd76966f54fb32a8c22d564f617df266a71 Mon Sep 17 00:00:00 2001

From: Zhang Dingyuan <zhangdingyuan@deepin.org>

Date: Fri, 24 Feb 2023 11:20:36 +0800

Subject: [PATCH] chore: sync upstream

kdecoration2 is updated.

Issue: https://github.com/linuxdeepin/developer-center/issues/3775

---

 src/decorations/decoratedclient.cpp                             | 5 +++++

 src/decorations/decoratedclient.h                               | 1 +

 src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp | 5 +++++

 src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h   | 1 +

 4 files changed, 12 insertions(+)

diff --git a/src/decorations/decoratedclient.cpp b/src/decorations/decoratedclient.cpp

index 057210e..23c0e9a 100644

--- a/src/decorations/decoratedclient.cpp

+++ b/src/decorations/decoratedclient.cpp

@@ -302,5 +302,10 @@ bool DecoratedClientImpl::isApplicationMenuActive() const

     return m_client->applicationMenuActive();

 }

+QString DecoratedClientImpl::windowClass() const

+{

+    return m_client->resourceName() + QLatin1Char(' ') + m_client->resourceClass();

+}

+

 }

 }

diff --git a/src/decorations/decoratedclient.h b/src/decorations/decoratedclient.h

index 78d0367..b4012bb 100644

--- a/src/decorations/decoratedclient.h

+++ b/src/decorations/decoratedclient.h

@@ -55,6 +55,7 @@ public:

     bool providesContextHelp() const override;

     QSize size() const override;

     int width() const override;

+    QString windowClass() const override;

     WId windowId() const override;

     Qt::Edges adjacentScreenEdges() const override;

diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp

index d5c848c..3e85f9c 100644

--- a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp

+++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp

@@ -246,6 +246,11 @@ bool PreviewClient::providesContextHelp() const

     return m_providesContextHelp;

 }

+QString PreviewClient::windowClass() const

+{

+    return {};

+}

+

 WId PreviewClient::windowId() const

 {

     return 0;

diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h

index fbd88a3..dddc99a 100644

--- a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h

+++ b/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h

@@ -73,6 +73,7 @@ public:

     bool isShadeable() const override;

     bool isShaded() const override;

     bool providesContextHelp() const override;

+    QString windowClass() const override;

     int width() const override;

     int height() const override;

--

libgit2 1.3.2