diff options
| author | Yoann Laissus <yoann.laissus@gmail.com> | 2010-08-21 22:29:20 +0200 |
|---|---|---|
| committer | Yoann Laissus <yoann.laissus@gmail.com> | 2010-08-21 22:29:20 +0200 |
| commit | 8b35e6ef013f37e75282a3c35b8952665fe250dc (patch) | |
| tree | 5f2f146778d95f9c6be6e22860a592f04151bf4d /src | |
| parent | - Fix BK toolbar drops at the extremities of the bar (diff) | |
| download | rekonq-8b35e6ef013f37e75282a3c35b8952665fe250dc.tar.xz | |
Forget to commit some changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 1a712939..20a76be9 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -342,11 +342,12 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) } KBookmarkGroup root = Application::bookmarkProvider()->rootGroup(); - KBookmarkActionInterface *destBookmarkAction = dynamic_cast<KBookmarkActionInterface *>(destAction); - QWidget *widgetAction = toolBar()->widgetForAction(destAction); if (destAction) { + KBookmarkActionInterface *destBookmarkAction = dynamic_cast<KBookmarkActionInterface *>(destAction); + QWidget *widgetAction = toolBar()->widgetForAction(destAction); + if (destBookmarkAction && !destBookmarkAction->bookmark().isNull() && widgetAction && bookmark.address() != destBookmarkAction->bookmark().address()) { @@ -367,7 +368,7 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) else { root.deleteBookmark(bookmark); - if (QCursor::pos().x() <= toolBar()->pos().x()) + if (QCursor::pos().x() < toolBar()->widgetForAction(toolBar()->actions().first())->pos().x()) { root.moveBookmark(bookmark, KBookmark()); } |