#5127: Add "Apply to selection" item for textures

codereader · Jan 9, 2021 · 6d0b0e1 · 6d0b0e1
1 parent 7ea6e7d
commit 6d0b0e1
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 4 deletions.
diff --git a/radiant/ui/favourites/FavouritesBrowser.cpp b/radiant/ui/favourites/FavouritesBrowser.cpp
@@ -18,7 +18,10 @@ namespace ui
 namespace
 {
     const char* const TAB_NAME = "favourites";
-    const char* const ADD_TO_FAVOURITES = N_("Add to Favourites");
+
+    const char* const APPLY_TEXTURE_TEXT = N_("Apply to selection");
+    const char* const APPLY_TEXTURE_ICON = "textureApplyToSelection16.png";
+
     const char* const REMOVE_FROM_FAVOURITES = N_("Remove from Favourites");
 }
 
@@ -77,6 +80,12 @@ void FavouritesBrowser::constructPopupMenu()
         std::bind(&FavouritesBrowser::onRemoveFromFavourite, this),
         [this]() { return _listView->GetSelectedItemCount() > 0; }
     );
+
+    _popupMenu->addItem(
+        new wxutil::IconTextMenuItem(_(APPLY_TEXTURE_TEXT), APPLY_TEXTURE_ICON),
+        std::bind(&FavouritesBrowser::onApplyToSelection, this),
+        std::bind(&FavouritesBrowser::testSingleTextureSelected, this)
+    );
 }
 
 void FavouritesBrowser::setupCategories()
@@ -285,17 +294,54 @@ void FavouritesBrowser::onContextMenu(wxContextMenuEvent& ev)
     _popupMenu->show(_listView);
 }
 
-void FavouritesBrowser::onRemoveFromFavourite()
+std::vector<long> FavouritesBrowser::getSelectedItems()
 {
+    std::vector<long> list;
+
     long item = _listView->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 
     while (item != -1)
     {
-        auto* data = reinterpret_cast<FavouriteItem*>(_listView->GetItemData(item));
-        GlobalFavouritesManager().removeFavourite(data->type, data->fullPath);
+        list.push_back(item);
 
         item = _listView->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
     }
+
+    return list;
+}
+
+void FavouritesBrowser::onRemoveFromFavourite()
+{
+    auto selection = getSelectedItems();
+
+    for (auto itemIndex : selection)
+    {
+        auto* data = reinterpret_cast<FavouriteItem*>(_listView->GetItemData(itemIndex));
+        GlobalFavouritesManager().removeFavourite(data->type, data->fullPath);
+    }
+
+    // A repopulation has already been rescheduled
+}
+
+void FavouritesBrowser::onApplyToSelection()
+{
+    auto selection = getSelectedItems();
+
+    if (selection.size() != 1) return;
+
+    auto* data = reinterpret_cast<FavouriteItem*>(_listView->GetItemData(selection.front()));
+
+    GlobalCommandSystem().executeCommand("SetShaderOnSelection", data->fullPath);
+}
+
+bool FavouritesBrowser::testSingleTextureSelected()
+{
+    auto selection = getSelectedItems();
+
+    if (selection.size() != 1) return false;
+
+    auto* data = reinterpret_cast<FavouriteItem*>(_listView->GetItemData(selection.front()));
+    return data->type == decl::Type::Material;
 }
 
 module::StaticModule<FavouritesBrowser> favouritesBrowserModule;

diff --git a/radiant/ui/favourites/FavouritesBrowser.h b/radiant/ui/favourites/FavouritesBrowser.h
@@ -75,6 +75,12 @@ class FavouritesBrowser :
     void onShowFullPathToggled(wxCommandEvent& ev);
     void onListCtrlPaint(wxPaintEvent& ev);
     void onContextMenu(wxContextMenuEvent& ev);
+
+    // Returns the list of all selected item indices
+    std::vector<long> getSelectedItems();
+
+    void onApplyToSelection();
+    bool testSingleTextureSelected();
 };
 
 }