From da0a772e4de4055fed8647f9d7c2a1595ce4a212 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 25 Jan 2025 13:43:01 +0100 Subject: [PATCH] Offset dropdown text labels and separators (#23700) * Centre dropdown separators optically and add margins * Offset dropdown item text slightly to add a slight margin --- src/openrct2-ui/windows/Dropdown.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index 19cf2ffc98..0c694ffb16 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -113,9 +113,9 @@ namespace OpenRCT2::Ui::Windows if (gDropdownItems[i].IsSeparator()) { - const ScreenCoordsXY leftTop = screenCoords + ScreenCoordsXY{ 0, (ItemHeight / 2) }; - const ScreenCoordsXY rightBottom = leftTop + ScreenCoordsXY{ ItemWidth - 1, 0 }; - const ScreenCoordsXY shadowOffset{ 0, 1 }; + const auto leftTop = screenCoords + ScreenCoordsXY{ 2, (ItemHeight / 2) - 1 }; + const auto rightBottom = leftTop + ScreenCoordsXY{ ItemWidth - 4, 0 }; + const auto shadowOffset = ScreenCoordsXY{ 0, 1 }; if (colours[0].hasFlag(ColourFlag::translucent)) { @@ -166,7 +166,8 @@ namespace OpenRCT2::Ui::Windows // Draw item string auto yOffset = GetAdditionalRowPadding(); Formatter ft(reinterpret_cast(&gDropdownItems[i].Args)); - DrawTextEllipsised(dpi, { screenCoords.x, screenCoords.y + yOffset }, width - 5, item, ft, { colour }); + DrawTextEllipsised( + dpi, { screenCoords.x + 2, screenCoords.y + yOffset }, width - 7, item, ft, { colour }); } } }