#4764: Thumbnail browser is now displaying folders in the "Other Mate…

…rials" branch

radiant/ui/materials/MaterialPopulator.cpp

@@ -31,6 +31,11 @@ MaterialPopulator::~MaterialPopulator()
     EnsureStopped();
 }
 
+std::string MaterialPopulator::GetOtherMaterialsName()
+{
+    return _(OTHER_MATERIALS_FOLDER);
+}
+
 void MaterialPopulator::AddSingleMaterial(const wxutil::TreeModel::Ptr& model, const std::string& materialName)
 {
     std::vector<std::string> parts;

radiant/ui/materials/MaterialPopulator.h

@@ -27,6 +27,8 @@ class MaterialPopulator :
     // Remove the given named material from the tree (assuming it is present)
     void RemoveSingleMaterial(const wxutil::TreeModel::Ptr& model, const std::string& materialName);
 
+    static std::string GetOtherMaterialsName();
+
 protected:
     void PopulateModel(const wxutil::TreeModel::Ptr& model) override;
 

radiant/ui/materials/MaterialTreeView.cpp

@@ -58,6 +58,19 @@ void MaterialTreeView::SetTreeMode(MaterialTreeView::TreeMode mode)
     SetSelectedFullname(previouslySelectedItem);
 }
 
+std::string MaterialTreeView::GetSelectedTextureFolderName()
+{
+    if (!IsDirectorySelected()) return {};
+
+    // The folder name is stored in the decl name column
+    auto fullName = GetSelectedFullname();
+
+    auto otherMaterialsPrefix = MaterialPopulator::GetOtherMaterialsName() + "/";
+
+    return string::starts_with(fullName, otherMaterialsPrefix) ? 
+        fullName.substr(otherMaterialsPrefix.length()) : fullName;
+}
+
 void MaterialTreeView::onMaterialCreated(const std::string& name)
 {
     auto populator = MaterialPopulator(Columns());

radiant/ui/materials/MaterialTreeView.h

@@ -37,6 +37,10 @@ class MaterialTreeView :
 
     virtual void SetTreeMode(MaterialTreeView::TreeMode mode) override;
 
+    // Returns the name of the texture folder without any "Other Materials" prefix
+    // Returns an empty string if no folder is selected
+    std::string GetSelectedTextureFolderName();
+
     // Loads all the materials
     virtual void Populate();
 

radiant/ui/mediabrowser/MediaBrowser.cpp

@@ -119,7 +119,7 @@ void MediaBrowser::onIdle()
         {
             // When a directory is selected, open the popup
             auto popup = new wxutil::TransientPopupWindow(this);
-            auto browser = new TextureDirectoryBrowser(popup, _treeView->GetSelectedFullname());
+            auto browser = new TextureDirectoryBrowser(popup, _treeView->GetSelectedTextureFolderName());
             popup->GetSizer()->Add(browser, 1, wxEXPAND | wxALL, 3);
 
             // Size reaching from the upper edge of the mediabrowser to the bottom of the screen (minus a few pixels)