#6514: "Choose source material" disabled for wildcard row

The text entry was already disabled when the "*" row is selected; now the browse button is also disabled.
nbohr1more · Jul 2, 2024 · c0a5a24 · c0a5a24
1 parent b97b7df
commit c0a5a24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/radiant/ui/skin/SkinEditor.cpp b/radiant/ui/skin/SkinEditor.cpp
@@ -216,7 +216,8 @@ void SkinEditor::setupRemappingPanel()
     _remappingList->EnableSearchPopup(false);
 
     // Material browse buttons
-    getControl<wxBitmapButton>("chooseRemappedSourceMaterialBtn")->Bind(
+    _sourceMaterialBrowseBtn = getControl<wxBitmapButton>("chooseRemappedSourceMaterialBtn");
+    _sourceMaterialBrowseBtn->Bind(
         wxEVT_BUTTON, [=](wxCommandEvent&) { chooseRemappedSourceMaterial(); }
     );
     getControl<wxBitmapButton>("chooseRemappedDestMaterialBtn")->Bind(
@@ -349,6 +350,7 @@ void SkinEditor::updateRemappingButtonSensitivity()
         !selectedSource.empty() && !isWildcardRow
     );
     _sourceMaterialEdit->Enable(!isWildcardRow);
+    _sourceMaterialBrowseBtn->Enable(!isWildcardRow);
 }
 
 void SkinEditor::updateSourceView(const decl::ISkin::Ptr& skin)

diff --git a/radiant/ui/skin/SkinEditor.h b/radiant/ui/skin/SkinEditor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sigc++/connection.h>
+#include <wx/bmpbuttn.h>
 
 #include "icommandsystem.h"
 #include "modelskin.h"
@@ -70,6 +71,7 @@ class SkinEditor final: public wxutil::DialogBase, private wxutil::XmlResourceBa
     wxutil::TreeView* _remappingList;
     wxWeakRef<wxTextCtrl> _sourceMaterialEdit;
     wxWeakRef<wxTextCtrl> _replacementMaterialEdit;
+    wxWeakRef<wxBitmapButton> _sourceMaterialBrowseBtn;
 
     wxutil::WindowPosition _windowPosition;
     wxutil::PanedPosition _leftPanePosition;