Workaround for Qt bug shown in issues #2763 and #2490

mgrojo · mgrojo · commit 532457edb7ab · 2021-07-18T16:33:24.000+02:00
- Adjust fixed sizes in EditTableDialog so the bug is less visible
- Resize columns to contents after item insertion, so it is not resized
to contents when only the header is present.
diff --git a/src/CondFormatManager.cpp b/src/CondFormatManager.cpp
@@ -123,6 +123,10 @@ void CondFormatManager::addItem(const CondFormat& aCondFormat)
 
     newItem->setText(ColumnFilter, aCondFormat.filter());
     ui->tableCondFormats->insertTopLevelItem(i, newItem);
+
+    for(int col = ColumnForeground; col < ColumnFilter; ++col) {
+        ui->tableCondFormats->resizeColumnToContents(col);
+    }
 }
 
 void CondFormatManager::removeItem()
diff --git a/src/EditTableDialog.cpp b/src/EditTableDialog.cpp
@@ -183,11 +183,11 @@ void EditTableDialog::keyPressEvent(QKeyEvent *evt)
 void EditTableDialog::updateColumnWidth()
 {
     ui->treeWidget->setColumnWidth(kName, 190);
-    ui->treeWidget->setColumnWidth(kType, 100);
-    ui->treeWidget->setColumnWidth(kNotNull, 30);
-    ui->treeWidget->setColumnWidth(kPrimaryKey, 30);
-    ui->treeWidget->setColumnWidth(kAutoIncrement, 30);
-    ui->treeWidget->setColumnWidth(kUnique, 30);
+    ui->treeWidget->setColumnWidth(kType, 150);
+    ui->treeWidget->setColumnWidth(kNotNull, 25);
+    ui->treeWidget->setColumnWidth(kPrimaryKey, 25);
+    ui->treeWidget->setColumnWidth(kAutoIncrement, 25);
+    ui->treeWidget->setColumnWidth(kUnique, 25);
     ui->treeWidget->setColumnWidth(kForeignKey, 500);
 
     ui->tableConstraints->setColumnWidth(kConstraintColumns, 180);

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,10 @@ void CondFormatManager::addItem(const CondFormat& aCondFormat)`
`123`	`123`
`124`	`124`	`newItem->setText(ColumnFilter, aCondFormat.filter());`
`125`	`125`	`ui->tableCondFormats->insertTopLevelItem(i, newItem);`
	`126`	`+`
	`127`	`+ for(int col = ColumnForeground; col < ColumnFilter; ++col) {`
	`128`	`+ ui->tableCondFormats->resizeColumnToContents(col);`
	`129`	`+ }`
`126`	`130`	`}`
`127`	`131`
`128`	`132`	`void CondFormatManager::removeItem()`