From 7a343606b4d1ed25256f4f437c184efc2de244b7 Mon Sep 17 00:00:00 2001
From: Person <Person@QCP2>
Date: Thu, 21 Dec 2017 20:09:08 -0800
Subject: [PATCH] --Bug fixes  -Fix crash when creating a dummy renderer when
 showing the final render dialog.  -Fix default tab size with new version of
 Qt.

---
 Builds/MSVC/Installer/Product.wxs             | 2 +-
 Data/Version History.txt                      | 8 ++++++--
 Data/dark_windows.qss                         | 2 +-
 Source/Fractorium/FractoriumCommon.h          | 2 +-
 Source/Fractorium/FractoriumEmberController.h | 3 ++-
 Source/Fractorium/FractoriumRender.cpp        | 7 +++++--
 Source/Fractorium/FractoriumXforms.cpp        | 4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs
index 82a7b3c..e105753 100644
--- a/Builds/MSVC/Installer/Product.wxs
+++ b/Builds/MSVC/Installer/Product.wxs
@@ -13,7 +13,7 @@
 	<!--
 	Change this for every release.
 	-->
-	<?define ProductCode="{FCEA107E-1FEE-4510-8361-6509749BEF80}"?>
+	<?define ProductCode="{4E5EFBC9-8572-4B82-A99E-A275DEA7A609}"?>
 	
 	<Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
 		<Package
diff --git a/Data/Version History.txt b/Data/Version History.txt
index 20d3147..6a353dc 100644
--- a/Data/Version History.txt	
+++ b/Data/Version History.txt	
@@ -1,8 +1,8 @@
-1.0.0.7 11/26/2017
+1.0.0.7 12/21/2017
 --User changes
  -Support 4k monitors, and in general, properly scale any monitor that is not HD.
  -Allow for a spatial filter of radius zero, which means do not use a spatial filter.
- -Add new variations: concentric, cpow3, helicoid, helix, rand_cubes, sphereblur.
+ -Add new variations: concentric, cpow3, helicoid, helix, rand_cubes, rays1, rays2, rays3, sphereblur.
  -Use a new method for computing elliptic which is more precise. Developed by Discord user Claude.
  -Remove the 8 variation per xform limitation on the GPU.
  -Allow for loading the last flame file on startup, rather than randoms.
@@ -13,6 +13,10 @@
  -No variations in an xform used to have the same behavior as a single linear variation with weight 1. While sensible, this breaks backward compatibility. No variations now sets the output point to zeroes.
  -Prevent crashing the program when adjusting a value on the main window while a final render is in progress.
  -The xaos table was inverted.
+ -Place the xforms and palette tabs in a scroll area to prevent weird sizing problems on low resolution monitors.
+ -Allow group dragging and floating of dock widgets.
+ -Make some tables auto size to their contents because some text appeared obscured on Linux.
+ -Opening an Xml was not properly setting the background field on the GUI, even though it was correctly parsed and used.
 
 --Code changes
  -Convert projects to Visual Studio 2017.
diff --git a/Data/dark_windows.qss b/Data/dark_windows.qss
index e3ae66d..1a46ab8 100644
--- a/Data/dark_windows.qss
+++ b/Data/dark_windows.qss
@@ -2,7 +2,7 @@
 		This is needed to deal with the large tabs in the fusion theme which is the default on Linux, and optional on Windows.
 		It's not needed for other themes.
 		You should keep this at the top of whatever custom style you make to ensure the tabs aren't unusually large.*/
-QTabBar::tab { height: 5ex; }
+QTabBar::tab { height: 3ex; }
 
 /*This is needed to give the labels on the status bar some padding.*/
 QStatusBar QLabel { padding-left: 2px; padding-right: 2px; }
diff --git a/Source/Fractorium/FractoriumCommon.h b/Source/Fractorium/FractoriumCommon.h
index ce5ca3e..4b4ed6c 100644
--- a/Source/Fractorium/FractoriumCommon.h
+++ b/Source/Fractorium/FractoriumCommon.h
@@ -497,7 +497,7 @@ static QString BaseStyle()
 #ifndef _WIN32
 		   "QTabBar::tab { height: 3ex; }\n\n"
 #else
-		   "QTabBar::tab { height: 5ex; }\n\n"
+		   "QTabBar::tab { height: 3ex; }\n\n"
 #endif
 		   "/*This is needed to give the labels on the status bar some padding.*/\n"
 		   "QStatusBar QLabel { padding-left: 2px; padding-right: 2px; }\n\n"
diff --git a/Source/Fractorium/FractoriumEmberController.h b/Source/Fractorium/FractoriumEmberController.h
index 3a6b4e3..d22a487 100644
--- a/Source/Fractorium/FractoriumEmberController.h
+++ b/Source/Fractorium/FractoriumEmberController.h
@@ -243,6 +243,7 @@ public:
 	virtual bool CreateRenderer(eRendererType renderType, const vector<pair<size_t, size_t>>& devices, bool updatePreviews, bool shared = true) { return false; }
 	virtual uint SizeOfT() const { return 0; }
 	virtual void ClearUndo() { }
+	virtual void DeleteRenderer() { }
 	virtual GLEmberControllerBase* GLController() { return nullptr; }
 	bool RenderTimerRunning();
 	void StartRenderTimer();
@@ -251,7 +252,6 @@ public:
 	void ClearFinalImages();
 	void Shutdown();
 	void UpdateRender(eProcessAction action = eProcessAction::FULL_RENDER);
-	void DeleteRenderer();
 	void SaveCurrentRender(const QString& filename, const EmberImageComments& comments, vector<v4F>& pixels, size_t width, size_t height, bool png16Bit, bool transparency);
 	RendererBase* Renderer() { return m_Renderer.get(); }
 	vector<v4F>* FinalImage() { return &(m_FinalImage); }
@@ -515,6 +515,7 @@ public:
 	virtual int ProgressFunc(Ember<T>& ember, void* foo, double fraction, int stage, double etaMs) override;
 	virtual void ClearUndo() override;
 	virtual GLEmberControllerBase* GLController() override { return m_GLController.get(); }
+	virtual void DeleteRenderer() override;
 
 private:
 	//Embers.
diff --git a/Source/Fractorium/FractoriumRender.cpp b/Source/Fractorium/FractoriumRender.cpp
index ad24823..e46dd75 100644
--- a/Source/Fractorium/FractoriumRender.cpp
+++ b/Source/Fractorium/FractoriumRender.cpp
@@ -93,11 +93,14 @@ void FractoriumEmberControllerBase::UpdateRender(eProcessAction action)
 
 /// <summary>
 /// Call Shutdown() then delete the renderer and clear the textures in the output window if there is one.
+/// Note the name is somewhat misleading because a new empty renderer is actually created as a placeholder.
+/// This is that the program won't crash if the user adjusts any of the controls while the renderer is shut down.
 /// </summary>
-void FractoriumEmberControllerBase::DeleteRenderer()
+template <typename T>
+void FractoriumEmberController<T>::DeleteRenderer()
 {
 	Shutdown();
-	m_Renderer = make_unique<EmberNs::Renderer<float, float>>();
+	m_Renderer = make_unique<EmberNs::Renderer<T, float>>();
 
 	if (GLController())
 		GLController()->ClearWindow();
diff --git a/Source/Fractorium/FractoriumXforms.cpp b/Source/Fractorium/FractoriumXforms.cpp
index 26534a7..ebe2811 100644
--- a/Source/Fractorium/FractoriumXforms.cpp
+++ b/Source/Fractorium/FractoriumXforms.cpp
@@ -120,8 +120,8 @@ void Fractorium::OnAddXformButtonClicked(bool checked) { m_Controller->AddXform(
 ///			From: All xaos values from the current xform are zero when going to any xform but the new one added, which is 1.
 ///			To: The xaos value coming from the current xform is 1 and the xaos values from all other xforms are 0, when going to the newly added xform.
 ///     Take different action when a single xform is selected vs. multiple.
-///         Single: Copy current xform's xaos values to the new one.
-///         Multiple: Set new xform's xaos values to 1, and except the last entry which is 0.
+///         Single: Copy the current xform's xaos values to the new one.
+///         Multiple: Set the new xform's xaos values to 1, and except the last entry which is 0.
 /// Called when the add xform button is clicked.
 /// Resets the rendering process.
 /// </summary>