1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00

Use larger cross glyph for close button when title bar is enlarged

This commit is contained in:
Aaron van Geffen
2025-04-11 20:39:26 +02:00
parent 3f87e2b67a
commit 883845bcf9
4 changed files with 36 additions and 15 deletions

View File

@@ -21,6 +21,7 @@
#include <limits>
#include <openrct2/SpriteIds.h>
#include <openrct2/config/Config.h>
#include <openrct2/drawing/Drawing.h>
#include <openrct2/interface/Window.h>
#include <openrct2/localisation/Formatter.h>
@@ -475,10 +476,11 @@ namespace OpenRCT2::Ui::Windows
void OnPrepareDraw() override
{
// This has to be called to ensure the window frame is correctly initialised - not doing this will
// cause an assertion to be hit.
ResizeFrameWithPage();
widgets[WIDX_CLOSE].text = colours[0].hasFlag(ColourFlag::translucent) ? STR_CLOSE_X_WHITE : STR_CLOSE_X;
bool useWhite = colours[0].hasFlag(ColourFlag::translucent);
if (Config::Get().interface.EnlargedUi)
widgets[WIDX_CLOSE].string = !useWhite ? kCloseBoxStringBlackLarge : kCloseBoxStringWhiteLarge;
else
widgets[WIDX_CLOSE].string = !useWhite ? kCloseBoxStringBlackNormal : kCloseBoxStringWhiteNormal;
// Having the content panel visible for transparent windows makes the borders darker than they should be
// For now just hide it if there are no tabs and the window is not resizable