1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00

Add large colour swatches for enlarged UI

This commit is contained in:
matheusvb3
2025-10-29 09:41:01 -03:00
committed by GitHub
parent c2ed2bd854
commit 47f45fac8f
9 changed files with 33 additions and 4 deletions

View File

@@ -5,6 +5,7 @@
- Improved: [#21375] The `load_object` console command now allows loading JSON objects.
- Improved: [#25297] Paths on the ground in SV4/SC4 no longer block supports of the paths above.
- Improved: [#25349] Recent Messages window can now be fully themed.
- Improved: [#25433] Colour dropdown now uses bigger images in Enlarged UI mode.
- Change: [#25089] Peep actions and animations that cause them to stop moving no longer trigger when they are on a level crossing.
- Change: [#25337] Placing track designs with scenery that is obstructed no longer disables all of the scenery.
- Fix: [#20198] Guest inventory from RCT1 base game saves is not imported.

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

View File

@@ -324,6 +324,18 @@
{
"path": "icons/colour_invisible_pressed.png"
},
{
"path": "icons/colour_large.png"
},
{
"path": "icons/colour_pressed_large.png"
},
{
"path": "icons/colour_invisible_large.png"
},
{
"path": "icons/colour_invisible_pressed_large.png"
},
{
"path": "icons/folder.png"
},

View File

@@ -468,7 +468,7 @@ namespace OpenRCT2::Ui::Windows
return -1;
}
// colour_t ordered for use in color dropdown
// colour_t ordered for use in colour dropdown
static constexpr colour_t kColoursDropdownOrder[] = {
COLOUR_BLACK,
COLOUR_SATURATED_RED,
@@ -621,9 +621,17 @@ namespace OpenRCT2::Ui::Windows
if (selectedColour == orderedColour)
defaultIndex = i;
// Use special graphic for Invisible colour
auto imageId = (orderedColour == COLOUR_INVISIBLE) ? ImageId(SPR_G2_ICON_PALETTE_INVISIBLE, COLOUR_WHITE)
: ImageId(SPR_PALETTE_BTN, orderedColour);
ImageId imageId;
if (Config::Get().interface.enlargedUi)
{
imageId = (orderedColour == COLOUR_INVISIBLE) ? ImageId(SPR_G2_ICON_PALETTE_INVISIBLE_LARGE, COLOUR_WHITE)
: ImageId(SPR_G2_ICON_PALETTE_LARGE, orderedColour);
}
else
{
imageId = (orderedColour == COLOUR_INVISIBLE) ? ImageId(SPR_G2_ICON_PALETTE_INVISIBLE, COLOUR_WHITE)
: ImageId(SPR_PALETTE_BTN, orderedColour);
}
gDropdown.items[i] = { .type = Dropdown::ItemType::colour, .image = imageId, .tooltip = kColourTooltips[i] };
}

View File

@@ -987,6 +987,10 @@ enum : ImageIndex
SPR_G2_PEEP_SPAWN,
SPR_G2_ICON_PALETTE_INVISIBLE,
SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED,
SPR_G2_ICON_PALETTE_LARGE,
SPR_G2_ICON_PALETTE_PRESSED_LARGE,
SPR_G2_ICON_PALETTE_INVISIBLE_LARGE,
SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED_LARGE,
SPR_G2_FOLDER,
SPR_G2_FOLDER_NEW,
SPR_G2_FOLDER_PARENT,

View File

@@ -169,6 +169,10 @@ namespace OpenRCT2::Scripting
{ "selection_edge_se", SPR_G2_SELECTION_EDGE_SE },
{ "palette_invisible", SPR_G2_ICON_PALETTE_INVISIBLE },
{ "palette_invisible_pressed", SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED },
{ "palette_large", SPR_G2_ICON_PALETTE_LARGE },
{ "palette_pressed_large", SPR_G2_ICON_PALETTE_PRESSED_LARGE },
{ "palette_invisible_large", SPR_G2_ICON_PALETTE_INVISIBLE_LARGE },
{ "palette_invisible_pressed_large", SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED_LARGE },
{ "monitor_start", SPR_G2_MONITOR_TAB_START },
{ "monitor_end", SPR_G2_MONITOR_TAB_END },
};