From aa461fca68fb03de22855d301afd896394dd6e7d Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 10 Dec 2024 05:00:46 +0000 Subject: [PATCH] Codechange: A transparent FrameRect doesn't care about colours. (#13162) --- src/widget.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/widget.cpp b/src/widget.cpp index 3cdeafb858..392e90264d 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -282,16 +282,15 @@ WidgetID GetWidgetFromPos(const Window *w, int x, int y) */ void DrawFrameRect(int left, int top, int right, int bottom, Colours colour, FrameFlags flags) { - assert(colour < COLOUR_END); - - uint dark = GetColourGradient(colour, SHADE_DARK); - uint medium_dark = GetColourGradient(colour, SHADE_LIGHT); - uint medium_light = GetColourGradient(colour, SHADE_LIGHTER); - uint light = GetColourGradient(colour, SHADE_LIGHTEST); - if (flags & FR_TRANSPARENT) { GfxFillRect(left, top, right, bottom, PALETTE_TO_TRANSPARENT, FILLRECT_RECOLOUR); } else { + assert(colour < COLOUR_END); + + const uint dark = GetColourGradient(colour, SHADE_DARK); + const uint medium_dark = GetColourGradient(colour, SHADE_LIGHT); + const uint medium_light = GetColourGradient(colour, SHADE_LIGHTER); + const uint light = GetColourGradient(colour, SHADE_LIGHTEST); uint interior; Rect outer = {left, top, right, bottom}; // Outside rectangle