From 2c2184f89d81df1b2744ddc964eb770a9ee7a112 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 17 Feb 2020 23:23:56 +0000 Subject: [PATCH] Fix viewport signs always using the larger font size for marking dirty --- src/viewport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/viewport.cpp b/src/viewport.cpp index f1080408c3..1f40ff8e71 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1759,10 +1759,10 @@ void ViewportSign::MarkDirty(ZoomLevel maxzoom) const Rect zoomlevels[ZOOM_LVL_COUNT]; for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) { - /* FIXME: This doesn't switch to width_small when appropriate. */ - zoomlevels[zoom].left = this->center - ScaleByZoom(this->width_normal / 2 + 1, zoom); + const int width = zoom >= ZOOM_LVL_OUT_16X ? this->width_small : this->width_normal ; + zoomlevels[zoom].left = this->center - ScaleByZoom(width / 2 + 1, zoom); zoomlevels[zoom].top = this->top - ScaleByZoom(1, zoom); - zoomlevels[zoom].right = this->center + ScaleByZoom(this->width_normal / 2 + 1, zoom); + zoomlevels[zoom].right = this->center + ScaleByZoom(width / 2 + 1, zoom); zoomlevels[zoom].bottom = this->top + ScaleByZoom(VPSM_TOP + FONT_HEIGHT_NORMAL + VPSM_BOTTOM + 1, zoom); }