diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-29 11:30:09 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-29 11:30:09 +0100 |
| commit | 8e37eb2a7f3f8f055b8918a518675e52548e790b (patch) | |
| tree | 789b03468b357fb0ec29b3b44b4e9ed9a8ba92b0 | |
| parent | Fixing hide/show tab bar and flickering new tabs. (diff) | |
| parent | a small delay before hide popup (diff) | |
| download | rekonq-8e37eb2a7f3f8f055b8918a518675e52548e790b.tar.xz | |
Merge commit 'refs/merge-requests/1946' of git://gitorious.org/rekonq/mainline into mr1946
| -rw-r--r-- | src/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | src/mainwindow.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 76e75dcf..abf82dbf 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -101,6 +101,7 @@ MainWindow::MainWindow() , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, false, false) ) , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, false) ) , m_popup( new KPassivePopup(this) ) + , m_hidePopup( new QTimer(this) ) , m_ac( new KActionCollection(this) ) { // enable window size "auto-save" @@ -146,6 +147,7 @@ MainWindow::MainWindow() connect(Application::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)), m_popup, SLOT(hide())); m_popup->setFrameShape(QFrame::NoFrame); m_popup->setLineWidth(0); + connect(m_hidePopup, SIGNAL(timeout()), m_popup, SLOT(hide())); QTimer::singleShot(0, this, SLOT(postLaunch())); } @@ -951,12 +953,12 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status) // deleting popus if empty msgs if(msg.isEmpty()) { - m_popup->hide(); + m_hidePopup->start(250); return; } - QPixmap px; - QString pixPath; + m_hidePopup->stop(); + switch(status) { diff --git a/src/mainwindow.h b/src/mainwindow.h index 64e2067c..50c3e7dc 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -168,6 +168,7 @@ private: QString m_lastSearch; KPassivePopup *m_popup; + QTimer *m_hidePopup; KActionCollection *m_ac; |