1 files changed, 24 insertions, 7 deletions

@@ -54,6 +54,9 @@ SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   Bind(wxEVT_MOUSEWHEEL, &SubwayMap::OnMouseScroll, this);
   Bind(wxEVT_LEAVE_WINDOW, &SubwayMap::OnMouseLeave, this);
   Bind(wxEVT_TIMER, &SubwayMap::OnTimer, this);
+
+  zoom_slider_ = new wxSlider(this, wxID_ANY, 0, 0, 8, {15, 15});
+  zoom_slider_->Bind(wxEVT_SLIDER, &SubwayMap::OnZoomSlide, this);
 }
 
 void SubwayMap::OnConnect() {
@@ -381,13 +384,7 @@ void SubwayMap::OnMouseScroll(wxMouseEvent &event) {
   }
 
   if (zoom_ != new_zoom) {
-    wxPoint map_pos = RenderPosToMapPos(event.GetPosition());
-    zoom_ = new_zoom;
-
-    wxPoint virtual_pos = MapPosToVirtualPos(map_pos);
-    SetZoomPos(-(virtual_pos - event.GetPosition()));
-
-    Refresh();
+    SetZoom(new_zoom, event.GetPosition());
   }
 
   event.Skip();
@@ -400,6 +397,14 @@ void SubwayMap::OnTimer(wxTimerEvent &event) {
   Refresh();
 }
 
+void SubwayMap::OnZoomSlide(wxCommandEvent &event) {
+  double new_zoom = 1.0 + 0.25 * zoom_slider_->GetValue();
+
+  if (new_zoom != zoom_) {
+    SetZoom(new_zoom, {GetSize().GetWidth() / 2, GetSize().GetHeight() / 2});
+  }
+}
+
 void SubwayMap::Redraw() {
   rendered_ = wxBitmap(map_image_);
 
@@ -530,6 +535,18 @@ void SubwayMap::SetScrollSpeed(int scroll_x, int scroll_y) {
   scroll_y_ = scroll_y;
 }
 
+void SubwayMap::SetZoom(double zoom, wxPoint static_point) {
+  wxPoint map_pos = RenderPosToMapPos(static_point);
+  zoom_ = zoom;
+
+  wxPoint virtual_pos = MapPosToVirtualPos(map_pos);
+  SetZoomPos(-(virtual_pos - static_point));
+
+  Refresh();
+
+  zoom_slider_->SetValue((zoom - 1.0) / 0.25);
+}
+
 quadtree::Box<float> SubwayMap::GetItemBox::operator()(const int &id) const {
   const SubwayItem &subway_item = GD_GetSubwayItem(id);
   return {static_cast<float>(subway_item.x), static_cast<float>(subway_item.y),