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

Part of #12096: Use ScreenRect on gfx_fill_rect in Tile*.cpp (#12248)

Browse Source
This commit is contained in:
frutiemax
2020-07-15 15:19:49 -04:00
committed by GitHub
parent f36a86e9e6
commit cd92597ec4
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -2254,7 +2254,9 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
const int32_t listWidth = w->widgets[WIDX_LIST].width();
gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light);
gfx_fill_rect(
dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } },
ColourMapA[w->colours[1]].mid_light);
ScreenCoordsXY screenCoords{};
screenCoords.y = SCROLLABLE_ROW_HEIGHT * (windowTileInspectorElementCount - 1);
@@ -2276,24 +2278,19 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo*
int32_t type = tileElement->GetType();
const char* typeName = "";
auto fillRectangle = ScreenRect{ { 0, screenCoords.y }, { listWidth, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1 } };
if (selectedRow)
{
gfx_fill_rect(
dpi, 0, screenCoords.y, listWidth, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1,
ColourMapA[w->colours[1]].mid_dark);
gfx_fill_rect(dpi, fillRectangle, ColourMapA[w->colours[1]].mid_dark);
}
else if (hoveredRow)
{
gfx_fill_rect(
dpi, 0, screenCoords.y, listWidth, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1,
ColourMapA[w->colours[1]].mid_dark | 0x1000000);
gfx_fill_rect(dpi, fillRectangle, ColourMapA[w->colours[1]].mid_dark | 0x1000000);
}
else if (((windowTileInspectorElementCount - i) & 1) == 0)
{
// Zebra stripes
gfx_fill_rect(
dpi, 0, screenCoords.y, listWidth, screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1,
ColourMapA[w->colours[1]].light | 0x1000000);
gfx_fill_rect(dpi, fillRectangle, ColourMapA[w->colours[1]].light | 0x1000000);
}
switch (type)

33
src/openrct2-ui/windows/TitleEditor.cpp
View File

@@ -855,7 +855,9 @@ static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
static void window_title_editor_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)
{
gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, ColourMapA[w->colours[1]].mid_light);
gfx_fill_rect(
dpi, { { dpi->x, dpi->y }, { dpi->x + dpi->width - 1, dpi->y + dpi->height - 1 } },
ColourMapA[w->colours[1]].mid_light);
switch (w->selected_tab)
{
case WINDOW_TITLE_EDITOR_TAB_SAVES:
@@ -878,25 +880,21 @@ static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelin
{
bool selected = false;
bool hover = false;
auto fillRect = ScreenRect{ screenCoords,
screenCoords + ScreenCoordsXY{ SCROLL_WIDTH + 100, SCROLLABLE_ROW_HEIGHT - 1 } };
if (i == w->selected_list_item)
{
selected = true;
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].dark);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].dark);
}
else if (i == _window_title_editor_highlighted_index || i == currentSaveIndex)
{
hover = true;
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].mid_dark);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].mid_dark);
}
else if (i & 1)
{
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].lighter | 0x1000000);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].lighter | 0x1000000);
}
char buffer[256];
@@ -934,25 +932,22 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
bool selected = false;
bool hover = false;
bool error = false;
auto fillRect = ScreenRect{ screenCoords,
screenCoords + ScreenCoordsXY{ SCROLL_WIDTH + 100, SCROLLABLE_ROW_HEIGHT - 1 } };
if (i == w->selected_list_item)
{
selected = true;
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].dark);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].dark);
}
else if (i == static_cast<int32_t>(_window_title_editor_highlighted_index) || i == position)
{
hover = true;
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].mid_dark);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].mid_dark);
}
else if (i & 1)
{
gfx_fill_rect(
dpi, screenCoords.x, screenCoords.y, screenCoords.x + SCROLL_WIDTH + 100,
screenCoords.y + SCROLLABLE_ROW_HEIGHT - 1, ColourMapA[w->colours[1]].lighter | 0x1000000);
gfx_fill_rect(dpi, fillRect, ColourMapA[w->colours[1]].lighter | 0x1000000);
}
auto ft = Formatter::Common();