Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 10 insertions, 2 deletions

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();