From 09a12f230f4e299c97f8b70b58ef20730bdcbf12 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 5 Feb 2024 17:55:04 +0000 Subject: [PATCH] Fix: Signals were incorrectly shifted by 1 pixel when selected. (#12005) Most shifting when pressed was removed by 884b9e66. --- src/rail_gui.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 7f5586b1e1..202d1ad80c 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1693,12 +1693,9 @@ private: /** * Draw dynamic a signal-sprite in a button in the signal GUI - * Draw the sprite +1px to the right and down if the button is lowered - * - * @param widget_index index of this widget in the window * @param image the sprite to draw */ - void DrawSignalSprite(const Rect &r, WidgetID widget_index, SpriteID image) const + void DrawSignalSprite(const Rect &r, SpriteID image) const { Point offset; Dimension sprite_size = GetSpriteSize(image, &offset); @@ -1707,9 +1704,7 @@ private: int y = ir.top - sig_sprite_bottom_offset + (ir.Height() + sig_sprite_size.height) / 2; // aligned to bottom - DrawSprite(image, PAL_NONE, - x + this->IsWidgetLowered(widget_index), - y + this->IsWidgetLowered(widget_index)); + DrawSprite(image, PAL_NONE, x, y); } /** Show or hide buttons for non-path signals in the signal GUI */ @@ -1786,7 +1781,7 @@ public: int var = SIG_SEMAPHORE - (widget - WID_BS_SEMAPHORE_NORM) / SIGTYPE_END; // SignalVariant order is reversed compared to the widgets. SpriteID sprite = GetRailTypeInfo(_cur_railtype)->gui_sprites.signals[type][var][this->IsWidgetLowered(widget)]; - this->DrawSignalSprite(r, widget, sprite); + this->DrawSignalSprite(r, sprite); } }