From: Peter Penz <peter.penz19@gmail.com>
Date: Wed, 6 Jan 2010 18:40:55 +0000 (+0000)
Subject: It is possible that the selection of an inactive column gets changed (e. g. by the... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b93b305d2ea75a1dd5c5953fb16374038d64f498?ds=inline

It is possible that the selection of an inactive column gets changed (e. g. by the selection markers). In this case the column should get active.

BUG: 188979

svn path=/trunk/KDE/kdebase/apps/; revision=1070789
---

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index ac131497e..361ddf696 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -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();
diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index c73ffc094..d4da86657 100644
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -85,6 +85,8 @@ public:
      */
     KFileItem itemAt(const QPoint& pos) const;
 
+    virtual void setSelectionModel(QItemSelectionModel* model);
+
 protected:
     virtual QStyleOptionViewItem viewOptions() const;
     virtual void startDrag(Qt::DropActions supportedActions);