mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Code Issues Releases Wiki Activity

Refactor window offset std::arrays into regular arrays (#12799)

Browse Source
This commit is contained in:
Aaron van Geffen
2020-09-09 22:51:51 +02:00
committed by GitHub
parent ba7b08acfc
commit 11ebe78328
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/openrct2-ui/interface/Window.cpp
View File

@@ -194,11 +194,11 @@ rct_window* window_create_auto_pos(
auto screenHeight = uiContext->GetHeight();
// Place window in an empty corner of the screen
const std::array<ScreenCoordsXY, 4> cornerPositions = {
ScreenCoordsXY{ 0, 30 }, // topLeft
ScreenCoordsXY{ screenWidth - width, 30 }, // topRight
ScreenCoordsXY{ 0, screenHeight - 34 - height }, // bottomLeft
ScreenCoordsXY{ screenWidth - width, screenHeight - 34 - height } // bottomRight
const ScreenCoordsXY cornerPositions[] = {
{ 0, 30 }, // topLeft
{ screenWidth - width, 30 }, // topRight
{ 0, screenHeight - 34 - height }, // bottomLeft
{ screenWidth - width, screenHeight - 34 - height } // bottomRight
};
for (const auto& cornerPos : cornerPositions)
@@ -212,14 +212,16 @@ rct_window* window_create_auto_pos(
{
if (w->flags & WF_STICK_TO_BACK)
continue;
const std::array<ScreenCoordsXY, 8> offsets = { ScreenCoordsXY{ w->width + 2, 0 },
ScreenCoordsXY{ -w->width - 2, 0 },
ScreenCoordsXY{ 0, w->height + 2 },
ScreenCoordsXY{ 0, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, -w->height - 2 },
ScreenCoordsXY{ -w->width - 2, -w->height - 2 },
ScreenCoordsXY{ w->width + 2, w->height + 2 },
ScreenCoordsXY{ -w->width - 2, w->height + 2 } };
const ScreenCoordsXY offsets[] = { { w->width + 2, 0 },
{ -w->width - 2, 0 },
{ 0, w->height + 2 },
{ 0, -w->height - 2 },
{ w->width + 2, -w->height - 2 },
{ -w->width - 2, -w->height - 2 },
{ w->width + 2, w->height + 2 },
{ -w->width - 2, w->height + 2 } };
for (const auto& offset : offsets)
{
auto screenPos = w->windowPos + offset;
@@ -236,10 +238,12 @@ rct_window* window_create_auto_pos(
continue;
// clang-format off
const std::array<ScreenCoordsXY, 4> offsets = { ScreenCoordsXY{ w->width + 2, 0 },
ScreenCoordsXY{ -w->width - 2, 0 },
ScreenCoordsXY{ 0, w->height + 2 },
ScreenCoordsXY{ 0, -w->height - 2 } };
const ScreenCoordsXY offsets[] = {
{ w->width + 2, 0 },
{ -w->width - 2, 0 },
{ 0, w->height + 2 },
{ 0, -w->height - 2 }
};
// clang-format on
for (const auto& offset : offsets)