Merge branch 'main' into future

1 files changed, 6 insertions, 5 deletions

@@ -7,19 +7,20 @@
 #include <wx/wx.h>
 #endif
 
-#include "eye_indicator.h"
-
-class AreaPopup : public wxScrolledWindow {
+class AreaPopup : public wxScrolledCanvas {
  public:
   AreaPopup(wxWindow* parent, int area_id);
 
   void UpdateIndicators();
 
  private:
+  void OnPaint(wxPaintEvent& event);
+
   int area_id_;
 
-  std::vector<wxStaticText*> section_labels_;
-  std::vector<EyeIndicator*> eye_indicators_;
+  wxBitmap unchecked_eye_;
+  wxBitmap checked_eye_;
+  wxBitmap rendered_;
 };
 
 #endif /* end of include guard: AREA_POPUP_H_03FAC988 */