From 81530e2574134bf21471aaf1d2aaa4aaa763eaf2 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 25 Sep 2025 08:45:25 +0100 Subject: [PATCH] Change: Support interface scaling in network client list buttons. --- src/network/network_gui.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index c1d1dfbf10..a8d2fc4859 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1339,7 +1339,7 @@ public: colour(colour), disabled(disabled) { - Dimension d = GetSpriteSize(sprite); + Dimension d = GetScaledSpriteSize(sprite); this->height = d.height + WidgetDimensions::scaled.framerect.Vertical(); this->width = d.width + WidgetDimensions::scaled.framerect.Horizontal(); } @@ -1463,7 +1463,7 @@ public: bool rtl = _current_text_dir == TD_RTL; r = this->DrawButtons(r); - Dimension d = GetSpriteSize(SPR_COMPANY_ICON); + Dimension d = GetScaledSpriteSize(SPR_COMPANY_ICON); PaletteID pal = Company::IsValidID(this->company_id) ? GetCompanyPalette(this->company_id) : PALETTE_TO_GREY; DrawSpriteIgnorePadding(SPR_COMPANY_ICON, pal, r.WithWidth(d.width, rtl), SA_CENTER); @@ -1503,7 +1503,7 @@ public: } if (player_icon != 0) { - Dimension d = GetSpriteSize(player_icon); + Dimension d = GetScaledSpriteSize(player_icon); DrawSpriteIgnorePadding(player_icon, PALETTE_TO_GREY, r.WithWidth(d.width, rtl), SA_CENTER); tr = tr.Indent(d.width + WidgetDimensions::scaled.hsep_normal, rtl); } @@ -1514,7 +1514,7 @@ public: std::optional GetTooltip(Rect r, const Point &pt) const override { bool rtl = _current_text_dir == TD_RTL; - Dimension d = GetSpriteSize(SPR_PLAYER_SELF); + Dimension d = GetScaledSpriteSize(SPR_PLAYER_SELF); if (r.WithWidth(d.width, rtl).Contains(pt)) { const NetworkClientInfo *ci = NetworkClientInfo::GetIfValid(this->client_pool_id); @@ -1754,7 +1754,7 @@ public: break; case WID_CL_MATRIX: { - uint height = std::max({GetSpriteSize(SPR_COMPANY_ICON).height, GetSpriteSize(SPR_JOIN).height, GetSpriteSize(SPR_ADMIN).height, GetSpriteSize(SPR_CHAT).height}); + uint height = std::max({GetScaledSpriteSize(SPR_COMPANY_ICON).height, GetScaledSpriteSize(SPR_JOIN).height, GetScaledSpriteSize(SPR_ADMIN).height, GetScaledSpriteSize(SPR_CHAT).height}); height += WidgetDimensions::scaled.framerect.Vertical(); this->line_height = std::max(height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;