diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 5ef2a06767..83f7cb80e6 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -825,8 +825,8 @@ static Widget _windowFinancesResearchWidgets[] = { campaignButton->type = WindowWidgetType::Button; campaignButton->top = y; - campaignButton->bottom = y + BUTTON_FACE_HEIGHT + 1; - y += BUTTON_FACE_HEIGHT + 2; + campaignButton->bottom = y + kButtonFaceHeight + 1; + y += kButtonFaceHeight + 2; } else { @@ -908,7 +908,7 @@ static Widget _windowFinancesResearchWidgets[] = ft.Add(AdvertisingCampaignPricePerWeek[i]); DrawTextBasic(dpi, screenCoords + ScreenCoordsXY{ WH_SUMMARY, 0 }, STR_MARKETING_PER_WEEK, ft); - screenCoords.y += BUTTON_FACE_HEIGHT + 2; + screenCoords.y += kButtonFaceHeight + 2; } } } diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 564d01aa1b..f208f8b7b8 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -5735,7 +5735,7 @@ static_assert(std::size(RatingNames) == 6); // Anchor graph widget auto x = width - 4; - auto y = height - BUTTON_FACE_HEIGHT - 8; + auto y = height - kButtonFaceHeight - 8; widgets[WIDX_GRAPH].right = x; widgets[WIDX_GRAPH].bottom = y; @@ -5744,7 +5744,7 @@ static_assert(std::size(RatingNames) == 6); widgets[WIDX_GRAPH_ALTITUDE].top = y; widgets[WIDX_GRAPH_VERTICAL].top = y; widgets[WIDX_GRAPH_LATERAL].top = y; - y += BUTTON_FACE_HEIGHT + 1; + y += kButtonFaceHeight + 1; widgets[WIDX_GRAPH_VELOCITY].bottom = y; widgets[WIDX_GRAPH_ALTITUDE].bottom = y; widgets[WIDX_GRAPH_VERTICAL].bottom = y; diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index b641121e2b..41b84f514c 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -45,7 +45,7 @@ constexpr uint8_t CloseButtonWidth = 10; constexpr uint8_t kScrollableRowHeight = 12; constexpr uint8_t kListRowHeight = 12; constexpr uint8_t kTableCellHeight = 12; -#define BUTTON_FACE_HEIGHT 12 +constexpr uint8_t kButtonFaceHeight = 12; #define SPINNER_HEIGHT 12 #define DROPDOWN_HEIGHT 12