Fix window activation on trayicon click under KDE

kvirc · Mar 5, 2025 · b765e20 · b765e20
1 parent e685c96
commit b765e20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
@@ -124,6 +124,7 @@ KviTrayIconWidget::KviTrayIconWidget()
 	setToolTipTitle("KVIrc");
 	setIconByPixmap(*g_pDock1);
 	setStandardActionsEnabled(false);
+	connect(this, SIGNAL(activateRequested(bool, QPoint)), this, SLOT(activatedSlot(bool)));
 #else
 	setIcon(*g_pDock1);
 	connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(activatedSlot(QSystemTrayIcon::ActivationReason)));
@@ -481,10 +482,12 @@ void KviTrayIconWidget::refresh()
 #endif
 }
 
-#ifndef COMPILE_KDE_SUPPORT
-// Under Kde do nothing, KWin will restore/hide our window
-// See ctor doc: KStatusNotifierItem::KStatusNotifierItem ( QObject *  parent = nullptr )
-
+#ifdef COMPILE_KDE_SUPPORT
+void KviTrayIconWidget::activatedSlot(bool)
+{
+	toggleParentFrame();
+}
+# else
 void KviTrayIconWidget::activatedSlot(QSystemTrayIcon::ActivationReason reason)
 {
 	switch(reason)

diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
@@ -92,7 +92,9 @@ private slots:
 	void toggleParentFrame();
 	void doAway(bool);
 	void flashingTimerShot();
-#ifndef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE_SUPPORT
+	void activatedSlot(bool active);
+# else
 	void activatedSlot(QSystemTrayIcon::ActivationReason reason);
 #endif
 	void executeInternalCommand(bool);