#6162: Update controls when the skin declaration is changed. Fix skin…

… decl generation.
codereader · Nov 14, 2022 · ffbdd03 · ffbdd03
1 parent a0bc779
commit ffbdd03
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/radiant/ui/skin/SkinEditor.cpp b/radiant/ui/skin/SkinEditor.cpp
@@ -72,7 +72,7 @@ SkinEditor::SkinEditor() :
 
 SkinEditor::~SkinEditor()
 {
-
+    _skinModifiedConn.disconnect();
 }
 
 void SkinEditor::setupModelTreeView()
@@ -307,6 +307,22 @@ void SkinEditor::onSkinSelectionChanged(wxDataViewEvent& ev)
 {
     if (_controlUpdateInProgress) return;
 
+    _skinModifiedConn.disconnect();
+
+    auto skin = getSelectedSkin();
+
+    if (skin)
+    {
+        _skinModifiedConn = skin->signal_DeclarationChanged().connect(
+            sigc::mem_fun(*this, &SkinEditor::onSkinDeclarationChanged));
+    }
+
+    updateSkinControlsFromSelection();
+}
+
+void SkinEditor::onSkinDeclarationChanged()
+{
+    // Refresh all controls
     updateSkinControlsFromSelection();
 }
 

diff --git a/radiant/ui/skin/SkinEditor.h b/radiant/ui/skin/SkinEditor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <sigc++/connection.h>
+
 #include "icommandsystem.h"
 #include "modelskin.h"
 
@@ -66,6 +68,8 @@ class SkinEditor final :
 
     bool _controlUpdateInProgress;
 
+    sigc::connection _skinModifiedConn;
+
 private:
     SkinEditor();
     ~SkinEditor() override;
@@ -100,6 +104,8 @@ class SkinEditor final :
     void onSkinModelSelectionChanged(wxDataViewEvent& ev);
     void onSkinSelectionChanged(wxDataViewEvent& ev);
 
+    void onSkinDeclarationChanged();
+
     template<typename ObjectClass>
     ObjectClass* getControl(const std::string& name)
     {

diff --git a/radiantcore/skins/Doom3ModelSkin.cpp b/radiantcore/skins/Doom3ModelSkin.cpp
@@ -156,10 +156,12 @@ std::string Skin::generateSyntax()
 {
     std::stringstream output;
 
+    output << std::endl;
+
     // Export models (indentation one tab)
     for (const auto& model : _current->matchingModels)
     {
-        output << "\t" << model << std::endl;
+        output << "\tmodel\t\"" << model << "\"" << std::endl;
     }
 
     if (!_current->matchingModels.empty())