#5127: More ModelSelector WIP code

codereader · Jan 3, 2021 · a803743 · a803743
1 parent 28b719d
commit a803743
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 44 deletions.
diff --git a/radiant/ui/modelselector/ModelSelector.cpp b/radiant/ui/modelselector/ModelSelector.cpp
@@ -26,6 +26,7 @@
 #include <wx/splitter.h>
 #include <wx/checkbox.h>
 #include "wxutil/dataview/ResourceTreeViewToolbar.h"
+#include "ui/UserInterfaceModule.h"
 
 #include <functional>
 
@@ -52,7 +53,6 @@ ModelSelector::ModelSelector() :
 	_lastModel(""),
 	_lastSkin(""),
 	_populated(false),
-    _showSkins(true),
 	_showOptions(true)
 {
     // Set the default size of the window
@@ -205,24 +205,8 @@ ModelSelectorResult ModelSelector::showAndBlock(const std::string& curModel,
                                                 bool showOptions,
                                                 bool showSkins)
 {
-    _showSkins = showSkins;
-    _preselectedModel = curModel;
-
-    if (!_populated)
-    {
-        // Populate the tree of models
-        populateModels();
-    }
-
-#if !defined(__linux__)
-    // Trigger a rebuild of the tree
-    _treeView->Rebuild();
-#endif
-
-    if (_populated)
-    {
-        preSelectModel();
-    }
+    _treeView->SetShowSkins(showSkins);
+    _treeView->SetSelectedFullname(curModel);
 
     showInfoForSelectedModel();
 
@@ -263,25 +247,15 @@ ModelSelectorResult ModelSelector::chooseModel(const std::string& curModel,
     return Instance().showAndBlock(curModel, showOptions, showSkins);
 }
 
-void ModelSelector::onIdleReloadTree(wxIdleEvent& ev)
-{
-	Disconnect(wxEVT_IDLE, wxIdleEventHandler(ModelSelector::onIdleReloadTree), nullptr, this);
-
-	populateModels();
-}
-
 void ModelSelector::onSkinsOrModelsReloaded()
 {
     // Clear the flag, this triggers a new population next time the dialog is shown
     _populated = false;
 
-	// In the case we're already shown, post a refresh event when the app is idle
-	// We might be called from a worker thread, so don't deadlock the app
-	if (IsShownOnScreen())
-	{
-        // TODO: Use dispatcher
-		Connect(wxEVT_IDLE, wxIdleEventHandler(ModelSelector::onIdleReloadTree), nullptr, this);
-	}
+    GetUserInterfaceModule().dispatch([this] ()
+    {
+        populateModels();
+    });
 }
 
 void ModelSelector::onModelLoaded(const model::ModelNodePtr& modelNode)
@@ -353,15 +327,15 @@ void ModelSelector::showInfoForSelectedModel()
 
     // Get the model name, if this is blank we are looking at a directory,
     // so leave the table empty
-    std::string mName = _treeView->GetSelectedFullname();
-    if (mName.empty())
-        return;
+    std::string modelName = _treeView->GetSelectedFullname();
+
+    if (modelName.empty()) return;
 
     // Get the skin if set
     std::string skinName = _treeView->GetSelectedSkin();
 
     // Pass the model and skin to the preview widget
-    _modelPreview->setModel(mName);
+    _modelPreview->setModel(modelName);
     _modelPreview->setSkin(skinName);
 }
 
@@ -387,9 +361,6 @@ void ModelSelector::onReloadModels(wxCommandEvent& ev)
 	findNamedObject<wxButton>(this, "ModelSelectorReloadModelsButton")->Enable(false);
 	findNamedObject<wxButton>(this, "ModelSelectorReloadSkinsButton")->Enable(false);
 
-	// Remember the selected model before reloading
-	_preselectedModel = _treeView->GetSelectedFullname();
-
 	// This will fire the models reloaded signal after some time
 	GlobalModelCache().refreshModels(false);
 }
@@ -399,8 +370,6 @@ void ModelSelector::onReloadSkins(wxCommandEvent& ev)
 	findNamedObject<wxButton>(this, "ModelSelectorReloadModelsButton")->Enable(false);
 	findNamedObject<wxButton>(this, "ModelSelectorReloadSkinsButton")->Enable(false);
 
-	_preselectedModel = _treeView->GetSelectedFullname();
-
 	// When this is done, the skins reloaded signal is fired
 	GlobalModelSkinCache().refresh();
 }

diff --git a/radiant/ui/modelselector/ModelSelector.h b/radiant/ui/modelselector/ModelSelector.h
@@ -80,7 +80,6 @@ class ModelSelector :
 	// TRUE if the treeview has been populated
 	bool _populated;
     std::unique_ptr<ModelPopulator> _populator;
-    bool _showSkins;
 
     // The model to highlight on show
     std::string _preselectedModel;
@@ -123,7 +122,6 @@ class ModelSelector :
 	void onCancel(wxCommandEvent& ev);
 	void onReloadModels(wxCommandEvent& ev);
 	void onReloadSkins(wxCommandEvent& ev);
-	void onIdleReloadTree(wxIdleEvent& ev);
     void onTreeStorePopulationFinished(wxutil::TreeModel::PopulationFinishedEvent& ev);
 
 	// Update the info table with information from the currently-selected model, and

diff --git a/radiant/ui/modelselector/ModelTreeView.h b/radiant/ui/modelselector/ModelTreeView.h
@@ -80,6 +80,7 @@ class ModelTreeView :
         row[_columns.isSkin] = false;
         row[_columns.isFolder] = false;
         row[_columns.isFolder] = std::string();
+        row[_columns.isFavourite] = false;
 
         row.SendItemAdded();
         _progressItem = row.getItem();