one hell of an ugly workaround for what seems to be one hell of an ugly qt bug...

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index d647b5d..25333cf 100644 (file)
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -100,7 +100,6 @@ void NickListWidget::currentChanged(const QModelIndex &current, const QModelInde
     view->setModel(filter);
     QModelIndex source_current = Client::bufferModel()->mapToSource(current);
     view->setRootIndex(filter->mapFromSource(source_current));
-    view->expandAll();
     nickViews[newBufferId] = view;
     ui.stackedWidget->addWidget(view);
     ui.stackedWidget->setCurrentWidget(view);

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 7a2c477..6b883d9 100644 (file)
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -30,15 +30,13 @@
 #include "types.h"
 #include "client.h"
 
-struct LazySizeHint {
-  LazySizeHint() : size(QSize()), needsUpdate(true) {};
-  QSize size;
-  bool needsUpdate;
+class ExpandAllEvent : public QEvent {
+public:
+  ExpandAllEvent() : QEvent(QEvent::User) {}
 };
 
 NickView::NickView(QWidget *parent)
-  : QTreeView(parent),
-    _sizeHint(new LazySizeHint())
+  : QTreeView(parent)
 {
   setIndentation(10);
   setAnimated(true);
@@ -55,20 +53,12 @@ NickView::NickView(QWidget *parent)
           this, SLOT(startQuery( const QModelIndex& )));
 }
 
-NickView::~NickView() {
-  delete _sizeHint;
-  _sizeHint = 0;
-}
-
 void NickView::init() {
   if(!model())
     return;
 
   for(int i = 1; i < model()->columnCount(); i++)
     setColumnHidden(i, true);
-
-  expandAll();
-  _sizeHint->needsUpdate = true;
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -78,19 +68,15 @@ void NickView::setModel(QAbstractItemModel *model) {
 
 void NickView::rowsInserted(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
-  if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent))
-    expand(parent);
-  _sizeHint->needsUpdate = true;
-}
-
-void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
-  QTreeView::rowsAboutToBeRemoved(parent, start, end);
-  _sizeHint->needsUpdate = true;
+  if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) {
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
+  }
 }
 
-void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
-  QTreeView::dataChanged(topLeft, bottomRight);
-  _sizeHint->needsUpdate = true;
+void NickView::setRootIndex(const QModelIndex &index) {
+  QAbstractItemView::setRootIndex(index);
+  if(index.isValid())
+    QCoreApplication::postEvent(this, new ExpandAllEvent);
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -185,16 +171,30 @@ void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & com
   Client::instance()->userInput(bufferInfo, command);
 }
 
-QSize NickView::sizeHint() const {
-  Q_CHECK_PTR(_sizeHint);
-  if(_sizeHint->needsUpdate && model()) {;
-    int columnSize = 0;
-    for(int i = 0; i < model()->columnCount(); i++) {
-      if(!isColumnHidden(i))
-       columnSize += sizeHintForColumn(i);
+void NickView::customEvent(QEvent *event) {
+  // THIS IS A REPLACEMENT FOR expandAll()
+  /* WARNING: do not call expandAll()!
+   * it fucks up big time in combination with sorting and changing the rootIndex
+   * the following sequence of commands leads to unexpected behavior when inserting new items
+   * setSortingEnabled(true);
+   * setModel();
+   * expandAll();
+   * setRootIndex();
+   */
+  if(event->type() != QEvent::User)
+    return;
+
+  QModelIndex topLevelIdx;
+  for(int i = 0; i < model()->rowCount(rootIndex()); i++) {
+    topLevelIdx = model()->index(i, 0, rootIndex());
+    if(isExpanded(topLevelIdx))
+      continue;
+    else {
+      expand(topLevelIdx);
+      if(i < model()->rowCount(rootIndex()) - 1)
+        QCoreApplication::postEvent(this, new ExpandAllEvent);
+      break;
     }
-    _sizeHint->size = QSize(columnSize, 50);
-    _sizeHint->needsUpdate = false;
   }
-  return _sizeHint->size;
+  event->accept();
 }

diff --git a/src/uisupport/nickview.h b/src/uisupport/nickview.h
index b6bcee5..1e08c50 100644 (file)
--- a/src/uisupport/nickview.h
+++ b/src/uisupport/nickview.h
@@ -29,7 +29,6 @@
 
 
 class NickModel;
-class LazySizeHint;
 class FilteredNickModel;
 class QSortFilterProxyModel;
 class QResizeEvent;
@@ -39,23 +38,19 @@ class NickView : public QTreeView {
 
 public:
   NickView(QWidget *parent = 0);
-  virtual ~NickView();
 
 protected:
   virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-  virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-  virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-  virtual QSize sizeHint() const;
+  virtual void customEvent(QEvent *event);
 
 public slots:
-  void setModel(QAbstractItemModel *model);
+  virtual void setModel(QAbstractItemModel *model);
+  virtual void setRootIndex(const QModelIndex &index);
   void init();
   void showContextMenu(const QPoint & pos);
   void startQuery(const QModelIndex & modelIndex);
-  
-private:
-  LazySizeHint *_sizeHint;
 
+private:
   BufferInfo bufferInfoFromModelIndex(const QModelIndex & index);
   QString nickFromModelIndex(const QModelIndex & index);
   void executeCommand(const BufferInfo & bufferInfo, const QString & command);