From 666551c31275db9b1668b29342d99ca2a485cfa7 Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sun, 21 Feb 2021 05:25:55 +0100
Subject: [PATCH] #5532: Show/hide deform pages as needed

---
 install/ui/materialeditor.fbp           | 12 ++++++------
 install/ui/materialeditor.xrc           |  6 +++---
 radiant/ui/materials/MaterialEditor.cpp | 22 ++++++++++++++++++++++
 radiant/ui/materials/MaterialEditor.h   |  1 +
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/install/ui/materialeditor.fbp b/install/ui/materialeditor.fbp
index 4584310a66..c1c4dc1fd0 100644
--- a/install/ui/materialeditor.fbp
+++ b/install/ui/materialeditor.fbp
@@ -5501,7 +5501,7 @@
                                                                                                             <property name="border">0</property>
                                                                                                             <property name="flag">wxEXPAND</property>
                                                                                                             <property name="proportion">1</property>
-                                                                                                            <object class="wxBoxSizer" expanded="1">
+                                                                                                            <object class="wxBoxSizer" expanded="0">
                                                                                                                 <property name="minimum_size"></property>
                                                                                                                 <property name="name">bSizer7811</property>
                                                                                                                 <property name="orient">wxHORIZONTAL</property>
@@ -5567,11 +5567,11 @@
                                                                                                                         <property name="wrap">-1</property>
                                                                                                                     </object>
                                                                                                                 </object>
-                                                                                                                <object class="sizeritem" expanded="1">
+                                                                                                                <object class="sizeritem" expanded="0">
                                                                                                                     <property name="border">6</property>
                                                                                                                     <property name="flag">wxALIGN_CENTER_VERTICAL</property>
                                                                                                                     <property name="proportion">0</property>
-                                                                                                                    <object class="wxSpinCtrlDouble" expanded="1">
+                                                                                                                    <object class="wxSpinCtrlDouble" expanded="0">
                                                                                                                         <property name="BottomDockable">1</property>
                                                                                                                         <property name="LeftDockable">1</property>
                                                                                                                         <property name="RightDockable">1</property>
@@ -6176,7 +6176,7 @@
                                                                 <object class="notebookpage" expanded="0">
                                                                     <property name="bitmap"></property>
                                                                     <property name="label">Deform</property>
-                                                                    <property name="select">0</property>
+                                                                    <property name="select">1</property>
                                                                     <object class="wxPanel" expanded="0">
                                                                         <property name="BottomDockable">1</property>
                                                                         <property name="LeftDockable">1</property>
@@ -6308,7 +6308,7 @@
                                                                                     </object>
                                                                                     <object class="sizeritem" expanded="0">
                                                                                         <property name="border">6</property>
-                                                                                        <property name="flag">wxALL|wxEXPAND</property>
+                                                                                        <property name="flag">wxALL</property>
                                                                                         <property name="proportion">1</property>
                                                                                         <object class="wxBoxSizer" expanded="0">
                                                                                             <property name="minimum_size"></property>
@@ -7828,7 +7828,7 @@
                                                                 <object class="notebookpage" expanded="0">
                                                                     <property name="bitmap"></property>
                                                                     <property name="label">Misc</property>
-                                                                    <property name="select">1</property>
+                                                                    <property name="select">0</property>
                                                                     <object class="wxPanel" expanded="0">
                                                                         <property name="BottomDockable">1</property>
                                                                         <property name="LeftDockable">1</property>
diff --git a/install/ui/materialeditor.xrc b/install/ui/materialeditor.xrc
index 3ec4e0f447..8527db2687 100644
--- a/install/ui/materialeditor.xrc
+++ b/install/ui/materialeditor.xrc
@@ -1049,7 +1049,7 @@
 														</object>
 														<object class="notebookpage">
 															<label>Deform</label>
-															<selected>0</selected>
+															<selected>1</selected>
 															<object class="wxPanel" name="DeformPage">
 																<style>wxTAB_TRAVERSAL</style>
 																<object class="wxBoxSizer">
@@ -1071,7 +1071,7 @@
 																			</object>
 																			<object class="sizeritem">
 																				<option>1</option>
-																				<flag>wxALL|wxEXPAND</flag>
+																				<flag>wxALL</flag>
 																				<border>6</border>
 																				<object class="wxBoxSizer">
 																					<orient>wxVERTICAL</orient>
@@ -1307,7 +1307,7 @@
 														</object>
 														<object class="notebookpage">
 															<label>Misc</label>
-															<selected>1</selected>
+															<selected>0</selected>
 															<object class="wxPanel" name="MiscPage">
 																<style>wxTAB_TRAVERSAL</style>
 																<object class="wxBoxSizer">
diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
index 30e71adbcf..5aadcf06b6 100644
--- a/radiant/ui/materials/MaterialEditor.cpp
+++ b/radiant/ui/materials/MaterialEditor.cpp
@@ -298,6 +298,13 @@ void MaterialEditor::setupMaterialDeformPage()
     {
         dropdown->AppendString(pair.first);
     }
+
+    _deformPanels[Material::DEFORM_FLARE] = getControl<wxPanel>("DeformFlarePanel");
+    _deformPanels[Material::DEFORM_EXPAND] = getControl<wxPanel>("DeformExpandPanel");
+    _deformPanels[Material::DEFORM_MOVE] = getControl<wxPanel>("DeformMovePanel");
+    _deformPanels[Material::DEFORM_TURBULENT] = getControl<wxPanel>("DeformTurbulentPanel");
+    _deformPanels[Material::DEFORM_PARTICLE] = getControl<wxPanel>("DeformParticlePanel");
+    _deformPanels[Material::DEFORM_PARTICLE2] = getControl<wxPanel>("DeformParticle2Panel");
 }
 
 void MaterialEditor::setupMaterialStageView()
@@ -436,6 +443,14 @@ void MaterialEditor::updateMaterialPropertiesFromMaterial()
             deformDropdown->Select(0);
         }
 
+        // Hide the unrelated deform controls
+        for (const auto& pair : _deformPanels)
+        {
+            pair.second->Show(_material->getDeformType() == pair.first);
+        }
+
+        getControl<wxPanel>("DeformPage")->Layout();
+
         // Surround the definition with curly braces, these are not included
         auto definition = fmt::format("{0}\n{{{1}}}", _material->getName(), _material->getDefinition());
         _sourceView->SetValue(definition);
@@ -444,6 +459,13 @@ void MaterialEditor::updateMaterialPropertiesFromMaterial()
     {
         getControl<wxChoice>("MaterialEditorDeformChoice")->Select(0);
 
+        for (const auto& pair : _deformPanels)
+        {
+            pair.second->Hide();
+        }
+
+        getControl<wxPanel>("DeformPage")->Layout();
+
         getControl<wxCheckBox>("MaterialHasRenderBump")->SetValue(false);
         getControl<wxTextCtrl>("MaterialRenderBumpArguments")->SetValue("");
 
diff --git a/radiant/ui/materials/MaterialEditor.h b/radiant/ui/materials/MaterialEditor.h
index 030775da9b..0aac62caea 100644
--- a/radiant/ui/materials/MaterialEditor.h
+++ b/radiant/ui/materials/MaterialEditor.h
@@ -35,6 +35,7 @@ class MaterialEditor :
     MaterialPtr _material;
 
     std::set<std::shared_ptr<MaterialBinding>> _bindings;
+    std::map<Material::DeformType, wxPanel*> _deformPanels;
 
 private:
     MaterialEditor();