aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-12-12 15:33:14 +0000
committerGravatar Fabio Bas2009-12-12 15:33:14 +0000
commitb5f381dcbe8d9afdae98db217a08eb7c71eea4dd (patch)
tree39fc7fb10e0df84ffbeb3bdb2d0363baec740990 /src
parentremoved minimizeOnTray (diff)
downloadKVIrc-b5f381dcbe8d9afdae98db217a08eb7c71eea4dd.tar.gz
KVIrc-b5f381dcbe8d9afdae98db217a08eb7c71eea4dd.tar.bz2
KVIrc-b5f381dcbe8d9afdae98db217a08eb7c71eea4dd.zip
discriminate between minimization (closing to taskbar) and closing to tray
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3688 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index fde73d2e7..dc16e0978 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -345,11 +345,11 @@ void KviTrayIcon::fillContextPopup()
void KviTrayIcon::toggleParentFrame()
{
- if(!m_pFrm->isVisible() || m_pFrm->isMinimized())
+ if(!m_pFrm->isVisible())
{
//restore mainwindow
- m_pFrm->setWindowState(m_pFrm->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
m_pFrm->show();
+ m_pFrm->activateWindow();
} else {
m_pFrm->hide();
}