mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Split colours and colour flags

Browse Source
This commit is contained in:
Gymnasiast
2024-05-09 02:45:07 +02:00
committed by Michael Steenbeek
parent f5b5e45069
commit 8a181b5513
58 changed files with 596 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/scripting/CustomListView.cpp
View File

@@ -551,7 +551,7 @@ void CustomListView::MouseUp(const ScreenCoordsXY& pos)
void CustomListView::Paint(WindowBase* w, DrawPixelInfo& dpi, const ScrollBar* scroll) const
{
auto paletteIndex = ColourMapA[w->colours[1]].mid_light;
auto paletteIndex = ColourMapA[w->colours[1].colour].mid_light;
GfxFillRect(dpi, { { dpi.x, dpi.y }, { dpi.x + dpi.width, dpi.y + dpi.height } }, paletteIndex);
int32_t y = ShowColumnHeaders ? COLUMN_HEADER_HEIGHT : 0;
@@ -596,7 +596,7 @@ void CustomListView::Paint(WindowBase* w, DrawPixelInfo& dpi, const ScrollBar* s
{
GfxFillRect(
dpi, { { dpi.x, y }, { dpi.x + dpi.width, y + (kListRowHeight - 1) } },
ColourMapA[w->colours[1]].lighter | 0x1000000);
ColourMapA[w->colours[1].colour].lighter | 0x1000000);
}
// Columns
@@ -640,7 +640,7 @@ void CustomListView::Paint(WindowBase* w, DrawPixelInfo& dpi, const ScrollBar* s
{
y = scroll->v_top;
auto bgColour = ColourMapA[w->colours[1]].mid_light;
auto bgColour = ColourMapA[w->colours[1].colour].mid_light;
GfxFillRect(dpi, { { dpi.x, y }, { dpi.x + dpi.width, y + 12 } }, bgColour);
int32_t x = 0;
@@ -704,8 +704,8 @@ void CustomListView::PaintSeperator(
auto lineY1 = lineY0 + 1;
auto baseColour = ParentWindow->colours[1];
auto lightColour = ColourMapA[baseColour].lighter;
auto darkColour = ColourMapA[baseColour].mid_dark;
auto lightColour = ColourMapA[baseColour.colour].lighter;
auto darkColour = ColourMapA[baseColour.colour].mid_dark;
if (hasText)
{