From 95a71ea6d7d57b67c91f39fa4e275a8283e26b93 Mon Sep 17 00:00:00 2001
From: mfeemster <matt.feemster@gmail.com>
Date: Mon, 2 May 2016 17:49:58 -0700
Subject: [PATCH] --User changes  -Add apply all functionality to
 flatten/unflatten menu items.

---
 Source/Fractorium/Fractorium.ui       | 10 +++++-----
 Source/Fractorium/FractoriumMenus.cpp | 26 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui
index 5001c57..70f4cf3 100644
--- a/Source/Fractorium/Fractorium.ui
+++ b/Source/Fractorium/Fractorium.ui
@@ -143,7 +143,7 @@
        <item>
         <widget class="QCheckBox" name="ApplyAllParamsCheckBox">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Apply adjustments to all flames in the file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Apply adjustments to all flames in the file. Also applies to flatten/unflatten menu items.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
           <string>Apply All</string>
@@ -3513,8 +3513,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>263</width>
-                <height>700</height>
+                <width>118</width>
+                <height>618</height>
                </rect>
               </property>
               <property name="autoFillBackground">
@@ -5531,8 +5531,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>259</width>
-                   <height>652</height>
+                   <width>133</width>
+                   <height>52</height>
                   </rect>
                  </property>
                  <property name="sizePolicy">
diff --git a/Source/Fractorium/FractoriumMenus.cpp b/Source/Fractorium/FractoriumMenus.cpp
index d0c4554..a3704ca 100644
--- a/Source/Fractorium/FractoriumMenus.cpp
+++ b/Source/Fractorium/FractoriumMenus.cpp
@@ -753,7 +753,18 @@ void Fractorium::OnActionAddBothSymmetry(bool checked) { m_Controller->AddBothSy
 /// Resets the rendering process.
 /// </summary>
 template <typename T>
-void FractoriumEmberController<T>::Flatten() { UpdateXform([&] (Xform<T>* xform) { m_Ember.Flatten(XmlToEmber<T>::m_FlattenNames); FillVariationTreeWithXform(xform); }); }
+void FractoriumEmberController<T>::Flatten()
+{
+	UpdateXform([&] (Xform<T>* xform)
+	{
+		m_Ember.Flatten(XmlToEmber<T>::m_FlattenNames);
+		FillVariationTreeWithXform(xform);
+	}, eXformUpdate::UPDATE_CURRENT, false);//Don't update render, it'll update below.
+	UpdateAll([&](Ember<T>& ember)
+	{
+		ember.Flatten(XmlToEmber<T>::m_FlattenNames);
+	}, true, eProcessAction::FULL_RENDER, m_Fractorium->ApplyAll());
+}
 void Fractorium::OnActionFlatten(bool checked) { m_Controller->Flatten(); }
 
 /// <summary>
@@ -761,7 +772,18 @@ void Fractorium::OnActionFlatten(bool checked) { m_Controller->Flatten(); }
 /// Resets the rendering process.
 /// </summary>
 template <typename T>
-void FractoriumEmberController<T>::Unflatten() { UpdateXform([&] (Xform<T>* xform) { m_Ember.Unflatten(); FillVariationTreeWithXform(xform); }); }
+void FractoriumEmberController<T>::Unflatten()
+{
+	UpdateXform([&] (Xform<T>* xform)
+	{
+		m_Ember.Unflatten();
+		FillVariationTreeWithXform(xform);
+	}, eXformUpdate::UPDATE_CURRENT, false);//Don't update render, it'll update below.
+	UpdateAll([&](Ember<T>& ember)
+	{
+		ember.Unflatten();
+	}, true, eProcessAction::FULL_RENDER, m_Fractorium->ApplyAll());
+}
 void Fractorium::OnActionUnflatten(bool checked) { m_Controller->Unflatten(); }
 
 /// <summary>