2 files changed, 11 insertions, 4 deletions

@@ -16,6 +16,9 @@ class AreaPopup : public wxScrolledCanvas {
   void ResetIndicators();
   void UpdateIndicators();
 
+  int GetFullWidth() const { return full_width_; }
+  int GetFullHeight() const { return full_height_; }
+
  private:
   enum IndicatorType {
     kLOCATION,
@@ -179,7 +179,7 @@ void TrackerPanel::OnRefreshSavedata(wxCommandEvent &event) {
 }
 
 void TrackerPanel::Resize() {
-  wxSize panel_size = GetSize();
+  wxSize panel_size = GetClientSize();
   wxSize image_size = map_image_.GetSize();
 
   int final_x = 0;
@@ -234,9 +234,13 @@ void TrackerPanel::Resize() {
         final_y + map_area.map_y * final_width / image_size.GetWidth();
 
     area.popup->SetClientSize(
-        area.popup->GetVirtualSize().GetWidth(),
-        std::min(panel_size.GetHeight(),
-                 area.popup->GetVirtualSize().GetHeight()));
+        area.popup->GetFullWidth(),
+        std::min(panel_size.GetHeight(), area.popup->GetFullHeight()));
+
+    if (area.popup->GetSize().GetHeight() > panel_size.GetHeight()) {
+      area.popup->SetSize(area.popup->GetSize().GetWidth(),
+                          panel_size.GetHeight());
+    } 
 
     if (popup_x + area.popup->GetSize().GetWidth() > panel_size.GetWidth()) {
       popup_x = panel_size.GetWidth() - area.popup->GetSize().GetWidth();