mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Optionally align the toolbar buttons horizontally centred

Browse Source
This commit is contained in:
Aaron van Geffen
2024-05-08 20:47:55 +02:00
parent 16a7e36984
commit 6e607bbb37
1 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/openrct2-ui/windows/TopToolbar.cpp
View File

@@ -248,6 +248,19 @@ namespace OpenRCT2::Ui::Windows
WIDX_NEWS,
};
static constexpr size_t _totalToolbarElements = kWidgetOrderLeftGroup.size() + kWidgetOrderRightGroup.size();
// Make a combined version of both halves of the toolbar, with a separator halfway.
static constexpr std::array<int, _totalToolbarElements + 1> kWidgetOrderCombined = []() {
std::array<int, _totalToolbarElements + 1> combined;
auto halfWayPoint = std::copy(kWidgetOrderLeftGroup.begin(), kWidgetOrderLeftGroup.end(), combined.begin());
*halfWayPoint = WIDX_SEPARATOR;
std::copy(kWidgetOrderRightGroup.begin(), kWidgetOrderRightGroup.end(), halfWayPoint + 1);
return combined;
}();
#pragma endregion
static Widget _topToolbarWidgets[] = {
@@ -3159,6 +3172,36 @@ namespace OpenRCT2::Ui::Windows
}
}
void AlignButtonsCentre()
{
// First, we figure out how much space we'll be needing
auto totalWidth = 0;
for (auto widgetIndex : kWidgetOrderCombined)
{
auto* widget = &widgets[widgetIndex];
if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR)
continue;
totalWidth += widget->width();
}
// We'll start from the centre of the UI...
auto xPos = (ContextGetWidth() - totalWidth) / 2;
for (auto widgetIndex : kWidgetOrderCombined)
{
auto* widget = &widgets[widgetIndex];
if (widget->type == WindowWidgetType::Empty && widgetIndex != WIDX_SEPARATOR)
continue;
auto widgetWidth = widget->width();
widget->left = xPos;
xPos += widgetWidth;
widget->right = xPos;
xPos += 1;
}
}
void OnPrepareDraw() override
{
ResetWidgetToDefaultState();
@@ -3173,7 +3216,10 @@ namespace OpenRCT2::Ui::Windows
ApplyMapRotation();
ApplyFootpathPressed();
AlignButtonsLeftRight();
if (false)
AlignButtonsLeftRight();
else
AlignButtonsCentre();
}
void OnDraw(DrawPixelInfo& dpi) override