Merge branch 'main' into future

1 files changed, 6 insertions, 4 deletions

@@ -35,11 +35,11 @@ TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
 }
 
 void TrackerPanel::UpdateIndicators() {
-  Redraw();
-
   for (AreaIndicator &area : areas_) {
     area.popup->UpdateIndicators();
   }
+
+  Redraw();
 }
 
 void TrackerPanel::OnPaint(wxPaintEvent &event) {
@@ -178,8 +178,10 @@ void TrackerPanel::Redraw() {
     int popup_y =
         final_y + map_area.map_y * final_width / image_size.GetWidth();
 
-    area.popup->SetMaxSize(panel_size);
-    area.popup->GetSizer()->Fit(area.popup);
+    area.popup->SetClientSize(
+        area.popup->GetVirtualSize().GetWidth(),
+        std::min(panel_size.GetHeight(),
+                 area.popup->GetVirtualSize().GetHeight()));
 
     if (popup_x + area.popup->GetSize().GetWidth() > panel_size.GetWidth()) {
       popup_x = panel_size.GetWidth() - area.popup->GetSize().GetWidth();