Changes to make it work better on Windows

AreaWindows are now no longer separate controls but are instead just painted onto the TrackerPanel. This lets us avoid the complexity of z-ordering with sibling controls. We can also use the mouse motion event to display and hide the popups, which conveniently doesn't fire when the mouse is over a popup, so the popup won't hide until you mouse off of the window AND popup.

1 files changed, 12 insertions, 3 deletions

@@ -7,7 +7,7 @@
 #include <wx/wx.h>
 #endif
 
-#include "area_window.h"
+class AreaPopup;
 
 class TrackerPanel : public wxPanel {
  public:
@@ -16,15 +16,24 @@ class TrackerPanel : public wxPanel {
   void UpdateIndicators();
 
  private:
+  struct AreaIndicator {
+    int area_id = -1;
+    AreaPopup *popup = nullptr;
+    int real_x1 = 0;
+    int real_y1 = 0;
+    int real_x2 = 0;
+    int real_y2 = 0;
+  };
+ 
   void OnPaint(wxPaintEvent &event);
+  void OnMouseMove(wxMouseEvent &event);
 
   void Redraw();
 
   wxImage map_image_;
   wxBitmap rendered_;
 
-  std::vector<AreaWindow *> area_windows_;
-  std::vector<AreaPopup *> area_popups_;
+  std::vector<AreaIndicator> areas_;
 };
 
 #endif /* end of include guard: TRACKER_PANEL_H_D675A54D */