diff options
Diffstat (limited to 'src/dolphincolumnwidget.cpp')
| -rw-r--r-- | src/dolphincolumnwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index ca4db00c7..b1050afda 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -346,7 +346,7 @@ void DolphinColumnWidget::mousePressEvent(QMouseEvent* event) void DolphinColumnWidget::keyPressEvent(QKeyEvent* event) { QListView::keyPressEvent(event); - Q_ASSERT(m_view->m_controller->itemView() == this); + requestActivation(); m_view->m_controller->handleKeyPressEvent(event); } @@ -373,7 +373,8 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event) void DolphinColumnWidget::wheelEvent(QWheelEvent* event) { // let Ctrl+wheel events propagate to the DolphinView for icon zooming - if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) { + // (installing an event filter does not work, as the wheel event is handled first) + if (event->modifiers() & Qt::ControlModifier) { event->ignore(); return; } |
