52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 2724de097ff51a06e28579066a5085d5318a7b0e Mon Sep 17 00:00:00 2001
|
|
From: luoqing <luoqing@kylinsec.com.cn>
|
|
Date: Thu, 24 Aug 2023 14:37:03 +0800
|
|
Subject: [PATCH] fix(tray):Place all tray icons in the panel and no longer in
|
|
the tray container for the time being
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 将所有托盘图标都放到面板中,暂时不再放入托盘容器中
|
|
|
|
Related #12490
|
|
---
|
|
src/tray/kiran-tray.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/tray/kiran-tray.c b/src/tray/kiran-tray.c
|
|
index 9b40d96..2d5d418 100644
|
|
--- a/src/tray/kiran-tray.c
|
|
+++ b/src/tray/kiran-tray.c
|
|
@@ -1123,7 +1123,7 @@ kiran_tray_notify_icon_added(KiranTrayManager *manager,
|
|
priv = tray->priv;
|
|
|
|
id = kiran_notify_icon_get_id(icon);
|
|
- type = kiran_tray_get_icon_type(priv->settings, id);
|
|
+ // type = kiran_tray_get_icon_type(priv->settings, id);
|
|
|
|
/* 系统已知的通知图标如声音，网络，电池等不需要记录 */
|
|
if (kiran_notify_icon_get_category(icon) != KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE)
|
|
@@ -1136,6 +1136,10 @@ kiran_tray_notify_icon_added(KiranTrayManager *manager,
|
|
|
|
gtk_widget_set_name(GTK_WIDGET(icon), "iconWinButton");
|
|
|
|
+ gtk_box_pack_start(GTK_BOX(tray), GTK_WIDGET(icon), FALSE, TRUE, 0);
|
|
+ kiran_tray_icons_refresh(tray);
|
|
+
|
|
+ /*
|
|
if (type == ICON_SHOW_IN_PANEL)
|
|
{
|
|
gtk_box_pack_start(GTK_BOX(tray), GTK_WIDGET(icon), FALSE, TRUE, 0);
|
|
@@ -1149,6 +1153,7 @@ kiran_tray_notify_icon_added(KiranTrayManager *manager,
|
|
gtk_widget_show(priv->icons_win_button);
|
|
position_notify_icon_window(tray, FALSE);
|
|
}
|
|
+ */
|
|
|
|
g_signal_connect(icon,
|
|
"size-allocate",
|
|
--
|
|
2.33.0
|
|
|