From b87ce9c845131348a08d180ce97aa4e22d1c4b21 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 26 Apr 2025 22:38:24 +0100 Subject: [PATCH] Change: Draw info headers as shade of window colour instead of pixel colour. (#14123) Use the normal or lightest colour gradient to pick a suitable colour, instead of an arbitrary pixel colour. (Except for the NewGRF window's info panel, this happens to be the same colour.) --- src/fios_gui.cpp | 4 ++-- src/network/network_content_gui.cpp | 4 ++-- src/network/network_gui.cpp | 4 ++-- src/newgrf_gui.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index 6bf9210eee..bcccbeb2d8 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -535,8 +535,8 @@ public: Rect tr = r.Shrink(WidgetDimensions::scaled.frametext); tr.top += HEADER_HEIGHT; - /* Create the nice grayish rectangle at the details top */ - GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), PC_GREY); + /* Create the nice lighter rectangle at the details top */ + GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), GetColourGradient(COLOUR_GREY, SHADE_LIGHTEST)); DrawString(hr.left, hr.right, hr.top, STR_SAVELOAD_DETAIL_CAPTION, TC_FROMSTRING, SA_HOR_CENTER); if (this->selected == nullptr) return; diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index a782d5aa48..1ed0f530c5 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -687,8 +687,8 @@ public: Rect tr = r.Shrink(WidgetDimensions::scaled.frametext); tr.top += HEADER_HEIGHT; - /* Create the nice grayish rectangle at the details top */ - GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), PC_DARK_BLUE); + /* Create the nice darker rectangle at the details top */ + GfxFillRect(r.WithHeight(HEADER_HEIGHT).Shrink(WidgetDimensions::scaled.bevel.left, WidgetDimensions::scaled.bevel.top, WidgetDimensions::scaled.bevel.right, 0), GetColourGradient(COLOUR_LIGHT_BLUE, SHADE_NORMAL)); DrawString(hr.left, hr.right, hr.top, STR_CONTENT_DETAIL_TITLE, TC_FROMSTRING, SA_HOR_CENTER); /* Draw the total download size */ diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 05a007ef92..b2ca4ab126 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -623,8 +623,8 @@ public: tr.top += header_height; /* Draw the right menu */ - /* Create the nice grayish rectangle at the details top */ - GfxFillRect(r.WithHeight(header_height).Shrink(WidgetDimensions::scaled.bevel), PC_DARK_BLUE); + /* Create the nice darker rectangle at the details top */ + GfxFillRect(r.WithHeight(header_height).Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_LIGHT_BLUE, SHADE_NORMAL)); hr.top = DrawStringMultiLine(hr, header_msg, TC_FROMSTRING, SA_HOR_CENTER); if (sel == nullptr) return; diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index e074163fba..7cbc3d064a 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -906,8 +906,8 @@ struct NewGRFWindow : public Window, NewGRFScanCallback { } case WID_NS_NEWGRF_INFO_TITLE: { - /* Create the nice grayish rectangle at the details top. */ - GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), PC_DARK_BLUE); + /* Create the nice darker rectangle at the details top. */ + GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_MAUVE, SHADE_NORMAL)); DrawString(r.left, r.right, CentreBounds(r.top, r.bottom, GetCharacterHeight(FS_NORMAL)), STR_NEWGRF_SETTINGS_INFO_TITLE, TC_FROMSTRING, SA_HOR_CENTER); break; }