From 92bb0017878c11cc09376fae12279d401db707e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 19 Dec 2016 00:34:03 +0100 Subject: NOISSUE fix crash caused by missing instance view layout updates Layout wasn't updated in some cases while deleting instances. --- application/groupview/GroupView.cpp | 38 +++++++++++++++++------------------ application/groupview/GroupView.h | 1 + application/groupview/VisualGroup.cpp | 5 +++-- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'application') diff --git a/application/groupview/GroupView.cpp b/application/groupview/GroupView.cpp index 5a380318..a6844102 100644 --- a/application/groupview/GroupView.cpp +++ b/application/groupview/GroupView.cpp @@ -45,6 +45,7 @@ void GroupView::setModel(QAbstractItemModel *model) { QAbstractItemView::setModel(model); connect(model, &QAbstractItemModel::modelReset, this, &GroupView::modelReset); + connect(model, &QAbstractItemModel::rowsRemoved, this, &GroupView::rowsRemoved); } void GroupView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, @@ -62,6 +63,16 @@ void GroupView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e scheduleDelayedItemsLayout(); } +void GroupView::modelReset() +{ + scheduleDelayedItemsLayout(); +} + +void GroupView::rowsRemoved() +{ + scheduleDelayedItemsLayout(); +} + class LocaleString : public QString { public: @@ -87,35 +98,28 @@ void GroupView::updateGeometries() for (int i = 0; i < model()->rowCount(); ++i) { - const QString groupName = - model()->index(i, 0).data(GroupViewRoles::GroupRole).toString(); + const QString groupName = model()->index(i, 0).data(GroupViewRoles::GroupRole).toString(); if (!cats.contains(groupName)) { VisualGroup *old = this->category(groupName); if (old) { - cats.insert(groupName, new VisualGroup(old)); + auto cat = new VisualGroup(old); + cats.insert(groupName, cat); + cat->update(); } else { - cats.insert(groupName, new VisualGroup(groupName, this)); + auto cat = new VisualGroup(groupName, this); + cats.insert(groupName, cat); + cat->update(); } } } - /*if (m_editedCategory) - { - m_editedCategory = cats[m_editedCategory->text]; - }*/ - qDeleteAll(m_groups); m_groups = cats.values(); - for (auto cat : m_groups) - { - cat->update(); - } - if (m_groups.isEmpty()) { verticalScrollBar()->setRange(0, 0); @@ -152,12 +156,6 @@ void GroupView::updateGeometries() viewport()->update(); } -void GroupView::modelReset() -{ - scheduleDelayedItemsLayout(); - executeDelayedItemsLayout(); -} - bool GroupView::isIndexHidden(const QModelIndex &index) const { VisualGroup *cat = category(index); diff --git a/application/groupview/GroupView.h b/application/groupview/GroupView.h index a3863b6d..e0ff1cd9 100644 --- a/application/groupview/GroupView.h +++ b/application/groupview/GroupView.h @@ -60,6 +60,7 @@ protected slots: virtual void rowsInserted(const QModelIndex &parent, int start, int end) override; virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; void modelReset(); + void rowsRemoved(); protected: virtual bool isIndexHidden(const QModelIndex &index) const override; diff --git a/application/groupview/VisualGroup.cpp b/application/groupview/VisualGroup.cpp index 560fc9ca..235ca023 100644 --- a/application/groupview/VisualGroup.cpp +++ b/application/groupview/VisualGroup.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "GroupView.h" @@ -53,7 +54,6 @@ void VisualGroup::update() QPair VisualGroup::positionOf(const QModelIndex &index) const { - int x = 0; int y = 0; for (auto & row: rows) { @@ -66,7 +66,8 @@ QPair VisualGroup::positionOf(const QModelIndex &index) const } y++; } - return qMakePair(x, y); + qWarning() << "Item" << index.row() << index.data(Qt::DisplayRole).toString() << "not found in visual group" << text; + return qMakePair(0, 0); } int VisualGroup::rowTopOf(const QModelIndex &index) const -- cgit v1.2.3