diff --git a/contributors.md b/contributors.md index 8a6fb4a33e..395c051e5e 100644 --- a/contributors.md +++ b/contributors.md @@ -254,6 +254,7 @@ Appreciation for contributors who have provided substantial work, but are no lon * David Sungaila (sungaila) * Garrett Leach (GarrettLeach) * Ruohao (Jater) Xu (jaterx) +* Marcel Vos (MarcelVos96) ## Toolchain * (Balletie) - macOS diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index e8c3a38264..60497bb4fa 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -45,13 +45,21 @@ using namespace OpenRCT2::TrackMetaData; namespace OpenRCT2::Ui::Windows { static constexpr StringId WindowTitle = kStringIdNone; - static constexpr ScreenSize kWindowSize = { 601, 382 }; - static constexpr ScreenSize kWindowMaxSize = { 840, 828 }; static constexpr int32_t kWindowHeightResearch = 194; static constexpr int32_t RideListItemsMax = 384; static constexpr int32_t RideTabCount = 6; static constexpr int32_t GroupByTrackTypeWidth = 172; static constexpr int32_t kScrollItemSize = 116; + static constexpr int32_t kMinColCount = 5; + static constexpr int32_t kMaxColCount = 15; + static constexpr int32_t kMinRowCount = 2; + static constexpr int32_t kMaxRowCount = 7; + static constexpr int32_t kHorizontalPadding = 21; + static constexpr int32_t kVerticalPadding = 150; + static constexpr ScreenSize kWindowSize = { (kMinColCount * kScrollItemSize) + kHorizontalPadding, + (kMinRowCount * kScrollItemSize) + kVerticalPadding }; + static constexpr ScreenSize kWindowMaxSize = { (kMaxColCount * kScrollItemSize) + kHorizontalPadding, + (kMaxRowCount * kScrollItemSize) + kVerticalPadding }; #pragma region Ride type view order @@ -875,7 +883,7 @@ namespace OpenRCT2::Ui::Windows { widgets[WIDX_GROUP_BY_TRACK_TYPE].left = width - 8 - GroupByTrackTypeWidth; widgets[WIDX_GROUP_BY_TRACK_TYPE].right = width - 8; - widgets[WIDX_RIDE_LIST].right = width - 6 - 1; + widgets[WIDX_RIDE_LIST].right = width - 3 - 1; widgets[WIDX_RIDE_LIST].bottom = height - 65; }