diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-02-21 11:39:16 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-02-21 11:53:56 +0100 |
| commit | 56eea3785a2e3156b38fbafb779c25adcd5322f3 (patch) | |
| tree | 39c1e7ec2be1db4a9c420b3c5ea2bcde6497387b /src/bookmarks/bookmarkstoolbar.cpp | |
| parent | Get sure urlbar is updated on bookmarking (diff) | |
| download | rekonq-56eea3785a2e3156b38fbafb779c25adcd5322f3.tar.xz | |
Get sure mainbar is restored on restart after fullscreen close
Also take care about updating actions panels state
Cherry-picked from d4af6c8a5919
Diffstat (limited to 'src/bookmarks/bookmarkstoolbar.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 8dbda960..fc9a32df 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -289,7 +289,9 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) case QEvent::DragEnter: { QDragEnterEvent *dragEvent = static_cast<QDragEnterEvent*>(event); - if (dragEvent->mimeData()->hasFormat("application/rekonq-bookmark") || dragEvent->mimeData()->hasFormat("text/uri-list") || dragEvent->mimeData()->hasFormat("text/plain")) + if (dragEvent->mimeData()->hasFormat("application/rekonq-bookmark") + || dragEvent->mimeData()->hasFormat("text/uri-list") + || dragEvent->mimeData()->hasFormat("text/plain")) { QFrame* dropIndicatorWidget = new QFrame(toolBar()); dropIndicatorWidget->setFrameShape(QFrame::VLine); @@ -319,7 +321,9 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) case QEvent::DragMove: { QDragMoveEvent *dragEvent = static_cast<QDragMoveEvent*>(event); - if (dragEvent->mimeData()->hasFormat("application/rekonq-bookmark") || dragEvent->mimeData()->hasFormat("text/uri-list") || dragEvent->mimeData()->hasFormat("text/plain")) + if (dragEvent->mimeData()->hasFormat("application/rekonq-bookmark") + || dragEvent->mimeData()->hasFormat("text/uri-list") + || dragEvent->mimeData()->hasFormat("text/plain")) { QAction *overAction = toolBar()->actionAt(dragEvent->pos()); KBookmarkActionInterface *overActionBK = dynamic_cast<KBookmarkActionInterface*>(overAction); |