mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Changed ride vehicle list to have less padding (#18350)

Browse Source 
Co-authored-by: Rik Smeets <30838294+rik-smeets@users.noreply.github.com>
This commit is contained in:
73
2022-11-05 08:43:15 -04:00
committed by GitHub
parent 4c218ba443
commit 643d79b700
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2-ui/interface/Dropdown.h
View File

@@ -56,6 +56,7 @@ void WindowDropdownShowColour(rct_window* w, rct_widget* widget, uint8_t dropdow
void WindowDropdownShowColourAvailable(
rct_window* w, rct_widget* widget, uint8_t dropdownColour, uint8_t selectedColour, uint32_t availableColours);
uint32_t DropdownGetAppropriateImageDropdownItemsPerRow(uint32_t numItems);
bool WindowDropDownHasMultipleColumns(size_t numItems);
namespace Dropdown
{

5
src/openrct2-ui/windows/Dropdown.cpp
View File

@@ -473,3 +473,8 @@ uint32_t DropdownGetAppropriateImageDropdownItemsPerRow(uint32_t numItems)
{
return numItems < std::size(_appropriateImageDropdownItemsPerRow) ? _appropriateImageDropdownItemsPerRow[numItems] : 8;
}
bool WindowDropDownHasMultipleColumns(size_t numItems)
{
return numItems > DROPDOWN_TEXT_MAX_ROWS;
}

3
src/openrct2-ui/windows/Ride.cpp
View File

@@ -2073,9 +2073,10 @@ static void WindowRideShowVehicleTypeDropdown(rct_window* w, rct_widget* widget)
}
rct_widget* dropdownWidget = widget - 1;
auto width = WindowDropDownHasMultipleColumns(numItems) ? dropdownWidget->width() - 24 : dropdownWidget->width();
WindowDropdownShowTextCustomWidth(
{ w->windowPos.x + dropdownWidget->left, w->windowPos.y + dropdownWidget->top }, dropdownWidget->height() + 1,
w->colours[1], 0, Dropdown::Flag::StayOpen, numItems, widget->right - dropdownWidget->left);
w->colours[1], 0, Dropdown::Flag::StayOpen, numItems, width);
// Find the current vehicle type in the ordered list.
int32_t pos = 0;