Fix Crash resizing a column that doesn't exist

OpenZWave · Jun 8, 2020 · 18f15f4 · 18f15f4
1 parent 6eb844a
commit 18f15f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/ozwadmin-main/valuetable.cpp b/ozwadmin-main/valuetable.cpp
@@ -23,34 +23,30 @@ ValueTable::ValueTable(QTOZW_ValueIds::ValueIdGenres genre, QWidget *parent) :
 	this->setSelectionMode(QAbstractItemView::SingleSelection);
 	this->setSortingEnabled(true);
 	this->horizontalHeader()->setSectionsMovable(true);
-    this->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
 }
 
 void ValueTable::setModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel)
 {
     this->m_proxyModel->setSourceModel(model);
     this->m_proxyModel->setSelectionModel(selectionModel);
-    connect(this->m_proxyModel, &QAbstractItemModel::rowsInserted, this, &ValueTable::resizeContents);
-    connect(this->m_proxyModel, &QAbstractItemModel::rowsRemoved, this, &ValueTable::resizeContents);
+
     //connect(selectionModel, &QItemSelectionModel::currentRowChanged, this, &ValueTable::logChanges);
     QTableView::setModel(this->m_proxyModel);
+    /* move the Instance Column to the first entry */
+    this->horizontalHeader()->moveSection(QTOZW_ValueIds::ValueIdColumns::Instance, 0);
 
     for (int i = 0; i <= QTOZW_ValueIds::ValueIdColumns::ValueIdCount; i++) {
         switch (i) {
             case QTOZW_ValueIds::ValueIdColumns::Label:
             case QTOZW_ValueIds::ValueIdColumns::Value:
             case QTOZW_ValueIds::ValueIdColumns::Instance:
             case QTOZW_ValueIds::ValueIdColumns::Help:
-            break;
+                this->horizontalHeader()->setSectionResizeMode(i, QHeaderView::ResizeToContents);
+                break;
         default:
             this->horizontalHeader()->hideSection(i);
         }
     }
-    QTimer::singleShot(500, this, &ValueTable::resizeContents);
-}
-
-void ValueTable::resizeContents() {
-    this->resizeColumnsToContents();
 }
 
 void forEach(QAbstractItemModel* model, QModelIndex parent = QModelIndex()) {
@@ -59,8 +55,6 @@ void forEach(QAbstractItemModel* model, QModelIndex parent = QModelIndex()) {
     }
 }
 
-
-
 void ValueTable::logChanges(const QModelIndex &current, const QModelIndex &previous)
 {
     qCDebug(ozwadmin) << "SelectionChanged UnFiltered Rows:" << this->m_proxyModel->sourceModel()->rowCount();

diff --git a/ozwadmin-main/valuetable.h b/ozwadmin-main/valuetable.h
@@ -13,7 +13,6 @@ class ValueTable : public QTableView
 public slots:
 
 private slots:
-    void resizeContents();
     void logChanges(const QModelIndex &current, const QModelIndex &previous);
 private:
     QTOZW_proxyValueModel *m_proxyModel;