Fixed custom Views

[quassel.git] / src / client / modelpropertymapper.cpp

diff --git a/src/client/modelpropertymapper.cpp b/src/client/modelpropertymapper.cpp
index 31f8d54..fe2ffcb 100644 (file)
--- a/src/client/modelpropertymapper.cpp
+++ b/src/client/modelpropertymapper.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -53,6 +53,8 @@ void ModelPropertyMapper::setSelectionModel(QItemSelectionModel *selectionModel)
   _selectionModel = selectionModel;
   connect(_selectionModel, SIGNAL(currentRowChanged(QModelIndex, QModelIndex)),
          this, SLOT(setCurrentRow(QModelIndex, QModelIndex)));
+  connect(_selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+         this, SLOT(setCurrentIndex(QModelIndex, QModelIndex)));
   
   setCurrentRow(selectionModel->currentIndex(), QModelIndex());
 }
@@ -84,6 +86,11 @@ void ModelPropertyMapper::removeMapping(int column, int role, QObject *target, c
   _mappings.removeAll(Mapping(column, role, target, property));
 }
 
+void ModelPropertyMapper::setCurrentIndex(const QModelIndex &current, const QModelIndex &previous) {
+  if(current.row() == previous.row() && current.parent() != previous.parent())
+    setCurrentRow(current, previous);
+}
+
 void ModelPropertyMapper::setCurrentRow(const QModelIndex &current, const QModelIndex &previous) {
   Q_UNUSED(previous)
   foreach(Mapping mapping, _mappings) {