Merge branch 'main' into panels

1 files changed, 39 insertions, 1 deletions

@@ -1,5 +1,7 @@
 #include "area_popup.h"
 
+#include <wx/dcbuffer.h>
+
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
@@ -8,6 +10,8 @@
 
 AreaPopup::AreaPopup(wxWindow* parent, int area_id)
     : wxScrolledCanvas(parent, wxID_ANY), area_id_(area_id) {
+  SetBackgroundStyle(wxBG_STYLE_PAINT);
+
   unchecked_eye_ =
       wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
                        wxBITMAP_TYPE_PNG)
@@ -61,6 +65,19 @@ void AreaPopup::UpdateIndicators() {
     }
   }
 
+  if (AP_IsPaintingShuffle()) {
+    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.
+      int item_height = std::max(32, item_extent.GetHeight()) + 10;
+      acc_height += item_height;
+
+      if (item_extent.GetWidth() > col_width) {
+        col_width = item_extent.GetWidth();
+      }
+    }
+  }
+
   int item_width = col_width + 10 + 32;
   int full_width = std::max(header_extent.GetWidth(), item_width) + 20;
 
@@ -105,10 +122,31 @@ void AreaPopup::UpdateIndicators() {
 
     cur_height += 10 + 32;
   }
+
+  if (AP_IsPaintingShuffle()) {
+    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);
+
+      wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with friendly name.
+      mem_dc.DrawText(painting.internal_id,
+                      {10 + 32 + 10,
+                       cur_height + (32 - mem_dc.GetFontMetrics().height) / 2});
+
+      cur_height += 10 + 32;
+    }
+  }
 }
 
 void AreaPopup::OnPaint(wxPaintEvent& event) {
-  wxPaintDC dc(this);
+  wxBufferedPaintDC dc(this);
   PrepareDC(dc);
   dc.DrawBitmap(rendered_, 0, 0);