#6021: Allow set/unset favourites to operate non-recursively if desired

codereader · Jul 24, 2022 · a6bd7a2 · a6bd7a2
1 parent 36edf34
commit a6bd7a2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/libs/wxutil/dataview/ResourceTreeView.cpp b/libs/wxutil/dataview/ResourceTreeView.cpp
@@ -45,6 +45,7 @@ ResourceTreeView::ResourceTreeView(wxWindow* parent, const TreeModel::Ptr& model
     _mode(TreeMode::ShowAll),
     _expandTopLevelItemsAfterPopulation(false),
     _columnToSelectAfterPopulation(nullptr),
+    _setFavouritesRecursively(true),
     _declPathColumn(_columns.fullName)
 {
     _treeStore = model;
@@ -506,6 +507,11 @@ void ResourceTreeView::SetFavouriteRecursively(TreeModel::Row& row, bool isFavou
     }
 
     // Not a folder, set the desired status on this item
+    SetFavourite(row, isFavourite);
+}
+
+void ResourceTreeView::SetFavourite(TreeModel::Row& row, bool isFavourite)
+{
     row[_columns.isFavourite] = isFavourite;
     row[_columns.iconAndName] = TreeViewItemStyle::Declaration(isFavourite);
 
@@ -531,7 +537,19 @@ void ResourceTreeView::_onSetFavourite(bool isFavourite)
     // Grab this item and enter recursion, propagating the favourite status
     TreeModel::Row row(item, *GetModel());
 
-    SetFavouriteRecursively(row, isFavourite);
+    if (_setFavouritesRecursively)
+    {
+        SetFavouriteRecursively(row, isFavourite);
+    }
+    else
+    {
+        SetFavourite(row, isFavourite);
+    }
+}
+
+void ResourceTreeView::EnableSetFavouritesRecursively(bool enabled)
+{
+    _setFavouritesRecursively = enabled;
 }
 
 std::string ResourceTreeView::GetResourcePath(const TreeModel::Row& row)

diff --git a/libs/wxutil/dataview/ResourceTreeView.h b/libs/wxutil/dataview/ResourceTreeView.h
@@ -89,6 +89,7 @@ class ResourceTreeView :
 
     // Typename used to store favourites. Favourites disabled if empty.
     std::string _favouriteTypeName;
+    bool _setFavouritesRecursively;
 
     wxString _filterText;
 
@@ -136,6 +137,9 @@ class ResourceTreeView :
     // Disable favourite management features
     virtual void DisableFavouriteManagement();
 
+    // Whether add/remove favourites is operating recursively
+    virtual void EnableSetFavouritesRecursively(bool enabled);
+
     virtual bool IsDirectorySelected();
     virtual bool IsFavouriteSelected();
 
@@ -157,6 +161,7 @@ class ResourceTreeView :
 protected:
     virtual void PopulateContextMenu(wxutil::PopupMenu& popupMenu);
 
+    virtual void SetFavourite(TreeModel::Row& row, bool isFavourite);
     virtual void SetFavouriteRecursively(TreeModel::Row& row, bool isFavourite);
 
     virtual void SetupTreeModelFilter();