From 306d6d3ca9c9ad774d19135681a7f9805f77035f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 22 Feb 2015 14:06:29 -0500 Subject: Imported Upstream version 3.0.3 --- SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp') diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp index 1b47433..fdbbac2 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp @@ -272,7 +272,7 @@ void TableWindow::editColumn(const QModelIndex& idx) SqliteCreateTable::Column* modifiedColumn = columnDialog.getModifiedColumn(); structureModel->replaceColumn(idx.row(), modifiedColumn); - ui->structureView->resizeColumnToContents(0); + resizeStructureViewColumns(); } void TableWindow::delColumn(const QModelIndex& idx) @@ -291,7 +291,7 @@ void TableWindow::delColumn(const QModelIndex& idx) return; structureModel->delColumn(idx.row()); - ui->structureView->resizeColumnToContents(0); + resizeStructureViewColumns(); } void TableWindow::executeStructureChanges() @@ -870,6 +870,7 @@ void TableWindow::addColumn() ui->structureView->resizeColumnToContents(0); ui->structureView->setCurrentIndex(structureModel->index(structureModel->rowCount()-1, 0)); + resizeStructureViewColumns(); } void TableWindow::editColumn() @@ -1040,6 +1041,13 @@ void TableWindow::applyInitialTab() ui->tabWidget->setCurrentIndex(0); } +void TableWindow::resizeStructureViewColumns() +{ + // Resize all except last one, to avoid shrinking the "extend to end" column. + for (int c = 0, total = (ui->structureView->horizontalHeader()->count() - 1); c < total; ++c) + ui->structureView->resizeColumnToContents(c); +} + void TableWindow::updateDdlTab() { createTable->rebuildTokens(); -- cgit v1.2.3