From f6f4f603dbd72926880643afaed0547c86fee1fc Mon Sep 17 00:00:00 2001
From: Hongfei Shang <shanghongfei@kylinos.cn>
Date: Wed, 20 Jul 2022 21:06:39 +0800
Subject: [PATCH 1/2] icon: add fallback theme name

Signed-off-by: Hongfei Shang <shanghongfei@kylinos.cn>
---
 src/waylandclient.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp
index 39d6ea2..b8e1582 100644
--- a/src/waylandclient.cpp
+++ b/src/waylandclient.cpp
@@ -168,6 +168,7 @@ void WaylandClient::updateIcon()
     if (iconName == icon().name()) {
         return;
     }
+    QIcon::setFallbackThemeName("ukui-icon-theme-default");
     setIcon(QIcon::fromTheme(iconName));
 }
 
-- 
Gitee


From 82b517aad6238882ddd4c8e01bb6d0f97b7e70e1 Mon Sep 17 00:00:00 2001
From: liweidong <liweidong@kylinos.com>
Date: Thu, 21 Jul 2022 14:25:19 +0800
Subject: [PATCH 2/2] (#127919)tableMode: forbid transient client to minimize

---
 src/abstract_client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
index ee62854..941c9fd 100644
--- a/src/abstract_client.cpp
+++ b/src/abstract_client.cpp
@@ -2832,7 +2832,7 @@ void AbstractClient::makeOthersMinimize()
             continue;
         }
 
-        if (false == c->isMinimized()){
+        if (false == c->isMinimized() && c->transientFor() != nullptr) {
             printf("AbstractClient::makeOthersMinimize, minimize unminimized caption:%s\n", c->caption().toStdString().c_str());
             c->minimize(true);
         }
-- 
Gitee