Merge tag 'upstream/3.0.1'

Upstream version 3.0.1

# gpg: Signature made Tue 30 Dec 2014 12:06:57 AM 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>"

1 files changed, 14 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
index c7f615a..e99b9b8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
@@ -241,6 +241,17 @@ void DataView::setupDefShortcuts()
     BIND_SHORTCUTS(DataView, Action);
 }
 
+void DataView::resizeColumnsInitiallyToContents()
+{
+    int cols = gridView->model()->columnCount();
+    gridView->resizeColumnsToContents();
+    for (int i = 0; i < cols ; i++)
+    {
+        if (gridView->columnWidth(i) > CFG_UI.General.MaxInitialColumnWith.get())
+            gridView->setColumnWidth(i, CFG_UI.General.MaxInitialColumnWith.get());
+    }
+}
+
 void DataView::createStaticActions()
 {
     // Filtering actions
@@ -544,7 +555,10 @@ bool DataView::isUncommited() const
 void DataView::dataLoadingEnded(bool successful)
 {
     if (successful)
+    {
         updatePageEdit();
+        resizeColumnsInitiallyToContents();
+    }
 
     setNavigationState(true);
 }