Share icons across popups

1 files changed, 7 insertions, 11 deletions

@@ -7,6 +7,7 @@
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
+#include "icons.h"
 #include "tracker_config.h"
 #include "tracker_panel.h"
 #include "tracker_state.h"
@@ -129,7 +130,7 @@ void AreaPopup::UpdateIndicators() {
           (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
     }
 
-    wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+    const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;
 
     mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), cur_height});
 
@@ -155,7 +156,7 @@ void AreaPopup::UpdateIndicators() {
       mem_dc.SetTextForeground(*text_color);
 
       bool checked = reachable && AP_IsPaintingChecked(painting.internal_id);
-      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+      const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;
       mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), cur_height});
 
       wxSize item_extent = mem_dc.GetTextExtent(painting.display_name);
@@ -182,13 +183,8 @@ void AreaPopup::OnDPIChanged(wxDPIChangedEvent& event) {
 }
 
 void AreaPopup::LoadIcons() {
-  // TODO: We do not have to read these in and scale them for every single
-  // popup.
-  unchecked_eye_ =
-      wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
-                       wxBITMAP_TYPE_PNG)
-                   .Scale(FromDIP(32), FromDIP(32)));
-  checked_eye_ = wxBitmap(
-      wxImage(GetAbsolutePath("assets/checked.png").c_str(), wxBITMAP_TYPE_PNG)
-          .Scale(FromDIP(32), FromDIP(32)));
+  unchecked_eye_ = GetTheIconCache().GetIcon("assets/unchecked.png",
+                                             FromDIP(wxSize{32, 32}));
+  checked_eye_ =
+      GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32}));
 }