From 15f50df9f6944bee79d5f81c8ccfc7bc206d9d99 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 20 Jun 2007 20:48:36 +0000 Subject: don't pass a custom viewport URL to the context menu anymore, as this cannot work together with the menu actions svn path=/trunk/KDE/kdebase/apps/; revision=678175 --- src/dolphincolumnview.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/dolphincolumnview.cpp') diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 2941cab87..81337cb20 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -231,8 +231,15 @@ void ColumnWidget::contextMenuEvent(QContextMenuEvent* event) } QListView::contextMenuEvent(event); - const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos()); - m_view->m_controller->triggerContextMenuRequest(pos, m_url); + + const QModelIndex index = indexAt(event->pos()); + const KUrl& navigatorUrl = m_view->m_controller->url(); + if (index.isValid() || (m_url == navigatorUrl)) { + // Only open a context menu above an item or if the mouse is above + // the active column. + const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos()); + m_view->m_controller->triggerContextMenuRequest(pos); + } } void ColumnWidget::activate() -- cgit v1.3