From 02c331f4e766558bba580d5b7db883357be005d5 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 3 May 2023 12:43:16 -0400
Subject: 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.
---
 area_window.cpp | 68 ---------------------------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 area_window.cpp

(limited to 'area_window.cpp')

diff --git a/area_window.cpp b/area_window.cpp
deleted file mode 100644
index fded223..0000000
--- a/area_window.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "area_window.h"
-
-#include <iostream>
-
-#include "ap_state.h"
-#include "game_data.h"
-#include "tracker_state.h"
-
-AreaWindow::AreaWindow(wxWindow* parent, int area_id, AreaPopup* popup)
-    : wxWindow(parent, wxID_ANY), area_id_(area_id), popup_(popup) {
-  SetSize(EFFECTIVE_SIZE, EFFECTIVE_SIZE);
-
-  Redraw();
-
-  Bind(wxEVT_PAINT, &AreaWindow::OnPaint, this);
-  Bind(wxEVT_ENTER_WINDOW, &AreaWindow::OnEnterWindow, this);
-  Bind(wxEVT_LEAVE_WINDOW, &AreaWindow::OnLeaveWindow, this);
-}
-
-void AreaWindow::UpdateIndicators() { Redraw(); }
-
-void AreaWindow::OnPaint(wxPaintEvent& event) {
-  if (GetSize() != rendered_.GetSize()) {
-    Redraw();
-  }
-
-  wxPaintDC dc(this);
-  dc.DrawBitmap(rendered_, 0, 0);
-}
-
-void AreaWindow::OnEnterWindow(wxMouseEvent& event) { popup_->Show(); }
-
-void AreaWindow::OnLeaveWindow(wxMouseEvent& event) { popup_->Hide(); }
-
-void AreaWindow::Redraw() {
-  const wxBrush* brush_color = wxGREY_BRUSH;
-
-  const MapArea& map_area = GetGameData().GetMapArea(area_id_);
-  bool has_reachable_unchecked = false;
-  bool has_unreachable_unchecked = false;
-  for (int section_id = 0; section_id < map_area.locations.size();
-       section_id++) {
-    if (!GetAPState().HasCheckedGameLocation(area_id_, section_id)) {
-      if (GetTrackerState().IsLocationReachable(area_id_, section_id)) {
-        has_reachable_unchecked = true;
-      } else {
-        has_unreachable_unchecked = true;
-      }
-    }
-  }
-
-  if (has_reachable_unchecked && has_unreachable_unchecked) {
-    brush_color = wxYELLOW_BRUSH;
-  } else if (has_reachable_unchecked) {
-    brush_color = wxGREEN_BRUSH;
-  } else if (has_unreachable_unchecked) {
-    brush_color = wxRED_BRUSH;
-  }
-
-  int actual_border_size = GetSize().GetWidth() * BORDER_SIZE / EFFECTIVE_SIZE;
-
-  rendered_ = wxBitmap(GetSize());
-  wxMemoryDC dc;
-  dc.SelectObject(rendered_);
-  dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, actual_border_size));
-  dc.SetBrush(*brush_color);
-  dc.DrawRectangle({0, 0}, GetSize());
-}
-- 
cgit 1.4.1