From 9fa917ae57be5bcb23b78188e0b7eff33eeac483 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Sun, 14 Apr 2024 16:56:33 +0000 Subject: [PATCH] Rename SPINNER_HEIGHT to kSpinnerHeight --- src/openrct2-ui/windows/Finances.cpp | 3 +-- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2/interface/Window.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 83f7cb80e6..7d0f851d93 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -554,8 +554,7 @@ static Widget _windowFinancesResearchWidgets[] = if (i % 2 == 0) GfxFillRect( dpi, - { screenCoords - ScreenCoordsXY{ 0, 1 }, - screenCoords + ScreenCoordsXY{ 121, (kTableCellHeight - 2) } }, + { screenCoords - ScreenCoordsXY{ 0, 1 }, screenCoords + ScreenCoordsXY{ 121, (kTableCellHeight - 2) } }, ColourMapA[colours[1]].lighter | 0x1000000); DrawTextBasic(dpi, screenCoords - ScreenCoordsXY{ 0, 1 }, _windowFinancesSummaryRowLabels[i]); diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 9e73c90cf1..2629ad35c8 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1936,7 +1936,7 @@ static Widget _rideConstructionWidgets[] = { widgets[WIDX_SPEED_SETTING_SPINNER_DOWN].type = WindowWidgetType::Button; widgets[WIDX_SPEED_SETTING_SPINNER_DOWN].text = STR_NUMERIC_DOWN; - ResizeSpinner(WIDX_SPEED_SETTING_SPINNER, { 12, 138 }, { 85, SPINNER_HEIGHT }); + ResizeSpinner(WIDX_SPEED_SETTING_SPINNER, { 12, 138 }, { 85, kSpinnerHeight }); hold_down_widgets |= (1uLL << WIDX_SPEED_SETTING_SPINNER_UP) | (1uLL << WIDX_SPEED_SETTING_SPINNER_DOWN); } diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 41b84f514c..e74a5c94a3 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -46,7 +46,7 @@ constexpr uint8_t kScrollableRowHeight = 12; constexpr uint8_t kListRowHeight = 12; constexpr uint8_t kTableCellHeight = 12; constexpr uint8_t kButtonFaceHeight = 12; -#define SPINNER_HEIGHT 12 +constexpr uint8_t kSpinnerHeight = 12; #define DROPDOWN_HEIGHT 12 #define TEXT_INPUT_SIZE 1024