mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Take the nice additional changes from #16095

This commit is contained in:
Ian-Polito 2022-04-09 17:50:17 +02:00 committed by Hielke Morsink
parent c995abc25e
commit 5f60dc4081
No known key found for this signature in database
GPG Key ID: FE0B343DF883E7F2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/windows/Scenery.cpp
View File

@ -32,7 +32,8 @@ constexpr int32_t WINDOW_SCENERY_MIN_WIDTH = 634;
constexpr int32_t WINDOW_SCENERY_MIN_HEIGHT = 180; constexpr int32_t WINDOW_SCENERY_MIN_HEIGHT = 180;
constexpr int32_t SCENERY_BUTTON_WIDTH = 66; constexpr int32_t SCENERY_BUTTON_WIDTH = 66;
constexpr int32_t SCENERY_BUTTON_HEIGHT = 80; constexpr int32_t SCENERY_BUTTON_HEIGHT = 80;
constexpr int32_t SceneryTabWidth = 31; constexpr int32_t TabWidth = 31;
constexpr int32_t MaxTabs = 32;
constexpr uint8_t SceneryContentScrollIndex = 0; constexpr uint8_t SceneryContentScrollIndex = 0;
@ -734,8 +735,7 @@ public:
{ {
_tabEntries.clear(); _tabEntries.clear();
auto maxTabs = 32; for (ObjectEntryIndex scenerySetIndex = 0; scenerySetIndex < MaxTabs - 1; scenerySetIndex++)
for (ObjectEntryIndex scenerySetIndex = 0; scenerySetIndex < maxTabs - 1; scenerySetIndex++)
{ {
const auto* sceneryGroupEntry = get_scenery_group_entry(scenerySetIndex); const auto* sceneryGroupEntry = get_scenery_group_entry(scenerySetIndex);
if (sceneryGroupEntry != nullptr && scenery_group_is_invented(scenerySetIndex)) if (sceneryGroupEntry != nullptr && scenery_group_is_invented(scenerySetIndex))
@ -816,7 +816,7 @@ public:
} }
// Set required width // Set required width
_requiredWidth = static_cast<int32_t>(_tabEntries.size()) * SceneryTabWidth + 5; _requiredWidth = static_cast<int32_t>(_tabEntries.size()) * TabWidth + 5;
SortTabs(); SortTabs();
PrepareWidgets(); PrepareWidgets();
@ -1024,7 +1024,7 @@ private:
for (const auto& tabInfo : _tabEntries) for (const auto& tabInfo : _tabEntries)
{ {
auto widget = MakeTab(pos, STR_STRING_DEFINED_TOOLTIP); auto widget = MakeTab(pos, STR_STRING_DEFINED_TOOLTIP);
pos.x += 31; pos.x += TabWidth;
if (tabInfo.SceneryGroupIndex == OBJECT_ENTRY_INDEX_NULL) if (tabInfo.SceneryGroupIndex == OBJECT_ENTRY_INDEX_NULL)
{ {