From 16dbbf1b29334e91dc9b980a8de6f050ad4b210e Mon Sep 17 00:00:00 2001
From: mfeemster <matt.feemster@gmail.com>
Date: Mon, 14 Sep 2015 20:53:19 -0700
Subject: [PATCH] -Bug fixes: --Adjust xaos cells when any group modification
 is made, such as random, clear, or row/col change. --Remove some old style
 sheet code on the xforms tab that doesn't seem to make sense and was probably
 just a workaround for a transient Qt bug, of which there are hundreds.

---
 Source/Fractorium/Fractorium.ui        | 23 ----------------------
 Source/Fractorium/FractoriumXaos.cpp   |  7 +++++++
 Source/Fractorium/FractoriumXforms.cpp | 27 +++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui
index d643f11..3c17ccb 100644
--- a/Source/Fractorium/Fractorium.ui
+++ b/Source/Fractorium/Fractorium.ui
@@ -2604,29 +2604,6 @@
          <property name="autoFillBackground">
           <bool>false</bool>
          </property>
-         <property name="styleSheet">
-          <string notr="true">QTabWidget::pane
-{
-	border: 1px solid #898C95;
-	font: 9pt &quot;Segoe UI&quot;;
-}
-
-QTabWidget::tab-bar
-{
-	bottom: -1px;
-}
-
-DoubleSpinBox
-{
-	font: 9pt &quot;Segoe UI&quot;;
-}
-
-SpinBox
-{
-	font: 9pt &quot;Segoe UI&quot;;
-}
-</string>
-         </property>
          <property name="tabShape">
           <enum>QTabWidget::Triangular</enum>
          </property>
diff --git a/Source/Fractorium/FractoriumXaos.cpp b/Source/Fractorium/FractoriumXaos.cpp
index a9066ff..3291299 100644
--- a/Source/Fractorium/FractoriumXaos.cpp
+++ b/Source/Fractorium/FractoriumXaos.cpp
@@ -44,6 +44,9 @@ void FractoriumEmberController<T>::FillXaos()
 			}
 		}
 	}
+
+	m_Fractorium->ui.XaosTableView->resizeRowsToContents();
+	m_Fractorium->ui.XaosTableView->resizeColumnsToContents();
 }
 
 /// <summary>
@@ -199,6 +202,8 @@ void Fractorium::OnRandomXaosButtonClicked(bool checked) { m_Controller->RandomX
 void Fractorium::OnXaosRowDoubleClicked(int logicalIndex)
 {
 	ToggleTableRow(ui.XaosTableView, logicalIndex);
+	ui.XaosTableView->resizeRowsToContents();
+	ui.XaosTableView->resizeColumnsToContents();
 }
 
 /// <summary>
@@ -209,6 +214,8 @@ void Fractorium::OnXaosRowDoubleClicked(int logicalIndex)
 void Fractorium::OnXaosColDoubleClicked(int logicalIndex)
 {
 	ToggleTableCol(ui.XaosTableView, logicalIndex);
+	ui.XaosTableView->resizeRowsToContents();
+	ui.XaosTableView->resizeColumnsToContents();
 }
 
 template class FractoriumEmberController<float>;
diff --git a/Source/Fractorium/FractoriumXforms.cpp b/Source/Fractorium/FractoriumXforms.cpp
index 6af89a8..d63b2b1 100644
--- a/Source/Fractorium/FractoriumXforms.cpp
+++ b/Source/Fractorium/FractoriumXforms.cpp
@@ -31,7 +31,32 @@ void Fractorium::InitXformsUI()
 	connect(ui.XformWeightNameTable, SIGNAL(cellChanged(int, int)), this, SLOT(OnXformNameChanged(int, int)), Qt::QueuedConnection);
 
 	ui.CurrentXformCombo->setProperty("soloxform", -1);
-
+/*
+	ui.XformsTabWidget->setStyleSheet(
+		
+	"QTabWidget::pane \n"
+		"{\n"
+		"	border: 5px solid #898C95;\n"
+		"	font: 9pt &quot;Segoe UI&quot;;\n"
+		"}\n"
+		"\n"
+		"QTabWidget::tab-bar \n"
+		"{\n"
+		"	bottom: -8px;\n"
+		"}\n"
+		"\n"
+		"DoubleSpinBox \n"
+		"{\n"
+		"	font: 9pt &quot;Segoe UI&quot;;\n"
+		"}\n"
+		"\n"
+		"SpinBox \n"
+		"{\n"
+		"	font: 9pt &quot;Segoe UI&quot;;\n"
+		"}"
+		);
+		*/
+	
 #ifndef WIN32    
 	//For some reason linux makes these 24x24, even though the designer explicitly says 16x16.
 	ui.AddXformButton->setIconSize(QSize(16, 16));