From 60548b2dff138b6a98fce0074d7f974e958cf32d Mon Sep 17 00:00:00 2001 From: dP Date: Mon, 1 Nov 2021 22:26:47 +0300 Subject: [PATCH] Fix margin between company icon and company name in scaled UI --- src/network/network_gui.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 095c0a17c4..f317dbd6b4 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -2063,8 +2063,9 @@ public: Dimension d = GetSpriteSize(SPR_COMPANY_ICON); int offset = std::max(0, ((int)(this->line_height + 1) - (int)d.height) / 2); - uint text_left = left + (rtl ? (uint)WD_FRAMERECT_LEFT : d.width + 8); - uint text_right = right - (rtl ? d.width + 8 : (uint)WD_FRAMERECT_RIGHT); + uint padding = ScaleGUITrad(2); + uint text_left = left + (rtl ? (uint)WD_FRAMERECT_LEFT : d.width + padding * 2); + uint text_right = right - (rtl ? d.width + padding * 2 : (uint)WD_FRAMERECT_RIGHT); uint line_start = this->vscroll->GetPosition(); uint line_end = line_start + this->vscroll->GetCapacity(); @@ -2082,13 +2083,13 @@ public: } if (company_id == COMPANY_SPECTATOR) { - DrawSprite(SPR_COMPANY_ICON, PALETTE_TO_GREY, rtl ? right - d.width - 4 : left + 4, y + offset); + DrawSprite(SPR_COMPANY_ICON, PALETTE_TO_GREY, rtl ? right - d.width - padding : left + padding, y + offset); DrawString(rtl ? x : text_left, rtl ? text_right : x, y + text_y_offset, STR_NETWORK_CLIENT_LIST_SPECTATORS, TC_SILVER); } else if (company_id == COMPANY_NEW_COMPANY) { - DrawSprite(SPR_COMPANY_ICON, PALETTE_TO_GREY, rtl ? right - d.width - 4 : left + 4, y + offset); + DrawSprite(SPR_COMPANY_ICON, PALETTE_TO_GREY, rtl ? right - d.width - padding : left + padding, y + offset); DrawString(rtl ? x : text_left, rtl ? text_right : x, y + text_y_offset, STR_NETWORK_CLIENT_LIST_NEW_COMPANY, TC_WHITE); } else { - DrawCompanyIcon(company_id, rtl ? right - d.width - 4 : left + 4, y + offset); + DrawCompanyIcon(company_id, rtl ? right - d.width - padding : left + padding, y + offset); SetDParam(0, company_id); SetDParam(1, company_id);