Merge branch 'main' into panels

1 files changed, 35 insertions, 13 deletions

@@ -2,10 +2,13 @@
 
 #include <wx/dcbuffer.h>
 
+#include <algorithm>
+
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
 #include "tracker_config.h"
+#include "tracker_panel.h"
 #include "tracker_state.h"
 
 AreaPopup::AreaPopup(wxWindow* parent, int area_id)
@@ -43,15 +46,23 @@ void AreaPopup::UpdateIndicators() {
 
   mem_dc.SetFont(GetFont());
 
+  TrackerPanel* tracker_panel = dynamic_cast<TrackerPanel*>(GetParent());
+
   std::vector<int> real_locations;
 
   for (int section_id = 0; section_id < map_area.locations.size();
        section_id++) {
     const Location& location = map_area.locations.at(section_id);
 
-    if (!AP_IsLocationVisible(location.classification) &&
-        !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
-      continue;
+    if (tracker_panel->IsPanelsMode()) {
+      if (!location.panel) {
+        continue;
+      }
+    } else {
+      if (!AP_IsLocationVisible(location.classification) &&
+          !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
+        continue;
+      }
     }
 
     real_locations.push_back(section_id);
@@ -65,7 +76,7 @@ void AreaPopup::UpdateIndicators() {
     }
   }
 
-  if (AP_IsPaintingShuffle()) {
+  if (AP_IsPaintingShuffle() && !tracker_panel->IsPanelsMode()) {
     for (int painting_id : map_area.paintings) {
       const PaintingExit& painting = GD_GetPaintingExit(painting_id);
       wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with a friendly name.
@@ -102,10 +113,21 @@ void AreaPopup::UpdateIndicators() {
   for (int section_id : real_locations) {
     const Location& location = map_area.locations.at(section_id);
 
-    bool checked =
-        AP_HasCheckedGameLocation(location.ap_location_id) ||
-        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id)) ||
-        (IsLocationWinCondition(location) && AP_HasReachedGoal());
+    bool checked = false;
+    if (IsLocationWinCondition(location)) {
+      checked = AP_HasReachedGoal();
+    } else if (tracker_panel->IsPanelsMode()) {
+      checked = location.panel && std::any_of(
+          location.panels.begin(), location.panels.end(),
+          [tracker_panel](int panel_id) {
+            const Panel& panel = GD_GetPanel(panel_id);
+            return tracker_panel->GetSolvedPanels().contains(panel.nodepath);
+          });
+    } else {
+      checked =
+          AP_HasCheckedGameLocation(location.ap_location_id) ||
+          (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
+    }
 
     wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
 
@@ -123,18 +145,18 @@ void AreaPopup::UpdateIndicators() {
     cur_height += 10 + 32;
   }
 
-  if (AP_IsPaintingShuffle()) {
+  if (AP_IsPaintingShuffle() && !tracker_panel->IsPanelsMode()) {
     for (int painting_id : map_area.paintings) {
       const PaintingExit& painting = GD_GetPaintingExit(painting_id);
-      bool checked = AP_IsPaintingChecked(painting.internal_id);
-      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
-
-      mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
 
       bool reachable = IsPaintingReachable(painting_id);
       const wxColour* text_color = reachable ? wxWHITE : wxRED;
       mem_dc.SetTextForeground(*text_color);
 
+      bool checked = reachable && AP_IsPaintingChecked(painting.internal_id);
+      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+      mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
+
       wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with friendly name.
       mem_dc.DrawText(painting.internal_id,
                       {10 + 32 + 10,