diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 217800f3f3..1551e5a039 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -562,13 +562,13 @@ namespace OpenRCT2::Ui int32_t width = widget->width() - 4; if ((widget + 1)->type == WindowWidgetType::CloseBox) { - width -= kCloseButtonWidth; + width -= kCloseButtonSize; if ((widget + 2)->type == WindowWidgetType::CloseBox) - width -= kCloseButtonWidth; + width -= kCloseButtonSize; } topLeft.x += width / 2; if (Config::Get().interface.WindowButtonsOnTheLeft) - topLeft.x += kCloseButtonWidth; + topLeft.x += kCloseButtonSize; DrawTextEllipsised( dpi, topLeft, width, widget->text, Formatter::Common(), diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 1851e9be76..bc7d34a6f5 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -481,11 +481,11 @@ namespace OpenRCT2 if (Config::Get().interface.WindowButtonsOnTheLeft) { widgets[2].left = 2; - widgets[2].right = 2 + kCloseButtonWidth; + widgets[2].right = 2 + kCloseButtonSize; } else { - widgets[2].left = width - 3 - kCloseButtonWidth; + widgets[2].left = width - 3 - kCloseButtonSize; widgets[2].right = width - 3; } } @@ -564,7 +564,7 @@ namespace OpenRCT2 ScreenCoordsXY WindowGetViewportSoundIconPos(WindowBase& w) { - const uint8_t buttonOffset = (Config::Get().interface.WindowButtonsOnTheLeft) ? kCloseButtonWidth + 2 : 0; + const uint8_t buttonOffset = (Config::Get().interface.WindowButtonsOnTheLeft) ? kCloseButtonSize + 2 : 0; return w.windowPos + ScreenCoordsXY{ 2 + buttonOffset, 2 }; } } // namespace OpenRCT2 diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index f6ef3ec91d..0b151e5af8 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -150,7 +150,7 @@ namespace OpenRCT2 } }; - constexpr uint8_t kCloseButtonWidth = 10; + constexpr uint8_t kCloseButtonSize = 10; constexpr int32_t kScrollableRowHeight = 12; constexpr uint8_t kListRowHeight = 12;