diff options
Diffstat (limited to 'src/modules/notifier')
| -rw-r--r-- | src/modules/notifier/NotifierWindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/notifier/NotifierWindowTab.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 289eae90d..651b2a77b 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -227,7 +227,7 @@ void NotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId, con if(pWnd) { - if(pWnd->hasAttention()) + if(pWnd->hasAttention(KviWindow::MainWindowIsVisible)) m_bDisableHideOnMainWindowGotAttention = true; } diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp index 948b44fff..e49d97c78 100644 --- a/src/modules/notifier/NotifierWindowTab.cpp +++ b/src/modules/notifier/NotifierWindowTab.cpp @@ -151,14 +151,14 @@ void NotifierWindowTab::mouseDoubleClickEvent(QMouseEvent *) if(m_pWnd->mdiParent()) { - m_pWnd->frame()->raise(); - m_pWnd->frame()->setFocus(); - m_pWnd->frame()->setWindowState((m_pWnd->frame()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); - if(!m_pWnd->frame()->isVisible()) - m_pWnd->frame()->show(); + g_pMainWindow->raise(); + g_pMainWindow->setFocus(); + g_pMainWindow->setWindowState((g_pMainWindow->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); + if(!g_pMainWindow->isVisible()) + g_pMainWindow->show(); } - m_pWnd->frame()->setActiveWindow(m_pWnd); + g_pMainWindow->setActiveWindow(m_pWnd); } void NotifierWindowTab::closeMe() |