Fix OpenTTD#7004: Redraw linkgraph overlay correctly after zoom

Previously, when the user zooms in or out, the linkgraph overlay was recalculated before the zoom. This caused some stations and edges to be missing from the visible region of the viewport.
btzy · Dec 31, 2018 · ac83367 · ac83367
1 parent 4a255e8
commit ac83367
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
@@ -197,9 +197,11 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w)
 
 		Point pt = GetTileZoomCenterWindow(in, w);
 		if (pt.x != -1) {
-			ScrollWindowTo(pt.x, pt.y, -1, w, true);
+			bool update_overlay = ScrollWindowTo(pt.x, pt.y, -1, w, true);
 
-			DoZoomInOutWindow(in ? ZOOM_IN : ZOOM_OUT, w);
+			update_overlay = DoZoomInOutWindow(in ? ZOOM_IN : ZOOM_OUT, w) || update_overlay;
+
+			if (update_overlay) RebuildViewportOverlay(w);
 		}
 	}
 }

diff --git a/src/viewport.cpp b/src/viewport.cpp
@@ -2245,7 +2245,6 @@ bool ScrollWindowTo(int x, int y, int z, Window *w, bool instant)
 	if (instant) {
 		w->viewport->scrollpos_x = pt.x;
 		w->viewport->scrollpos_y = pt.y;
-		RebuildViewportOverlay(w);
 	}
 
 	w->viewport->dest_scrollpos_x = pt.x;