assure that the widgets of the panels are resized after receiving the Polish event

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 26ebdc91d49f55ac1c3d5d253f762c1a00d1c3ad..debe10d35567d527a57942aa4bb4a95d74deebf8 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -131,7 +131,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
 
     const QString nameFilter = controller->nameFilter();
     if (!nameFilter.isEmpty()) {
-        m_proxyModel->setFilterRegExp(nameFilter);
+        m_proxyModel->setFilterFixedString(nameFilter);
     }
 
     updateDecorationSize(dolphinView->showPreview());
@@ -192,6 +192,22 @@ KFileItem DolphinColumnView::itemAt(const QPoint& pos) const
     return item;
 }
 
+void DolphinColumnView::setSelectionModel(QItemSelectionModel* model)
+{
+    // If a change of the selection is done although the view is not active
+    // (e. g. by the selection markers), the column must be activated. This
+    // is done by listening to the current selectionChanged() signal.
+    if (selectionModel() != 0) {
+        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+                   this, SLOT(requestActivation()));
+    }
+
+    QListView::setSelectionModel(model);
+
+    connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            this, SLOT(requestActivation()));
+}
+
 QStyleOptionViewItem DolphinColumnView::viewOptions() const
 {
     QStyleOptionViewItem viewOptions = QListView::viewOptions();
@@ -333,10 +349,8 @@ void DolphinColumnView::contextMenuEvent(QContextMenuEvent* event)
 
 void DolphinColumnView::wheelEvent(QWheelEvent* event)
 {
-    const int height = m_decorationSize.height();
-    const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
+    const int step = m_decorationSize.height();
     verticalScrollBar()->setSingleStep(step);
-
     QListView::wheelEvent(event);
 }
 
@@ -349,15 +363,6 @@ void DolphinColumnView::leaveEvent(QEvent* event)
     m_container->m_controller->emitViewportEntered();
 }
 
-void DolphinColumnView::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
-{
-    QListView::selectionChanged(selected, deselected);
-
-    //QItemSelectionModel* selModel = m_container->selectionModel();
-    //selModel->select(selected, QItemSelectionModel::Select);
-    //selModel->select(deselected, QItemSelectionModel::Deselect);
-}
-
 void DolphinColumnView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     QListView::currentChanged(current, previous);