From 36d7e09369f98e01a8d1a40c69bd59af7de85840 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 30 Jun 2025 20:40:26 +0100 Subject: [PATCH] Fix: Include sort button width in content list header minimal size. (#14402) --- src/network/network_content_gui.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index 117a0c1e7b..13600aedba 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -583,18 +583,25 @@ public: { switch (widget) { case WID_NCL_CHECKBOX: - size.width = this->checkbox_size.width + padding.width; + size.width = std::max(this->checkbox_size.width, Window::SortButtonWidth()) + padding.width; break; case WID_NCL_TYPE: { + /* Width must be enough for header label and sort buttons.*/ + size.width += Window::SortButtonWidth() * 2; + /* And also enough for the width of each type of content. */ Dimension d = size; for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) { d = maxdim(d, GetStringBoundingBox(STR_CONTENT_TYPE_BASE_GRAPHICS + i - CONTENT_TYPE_BASE_GRAPHICS)); } - size.width = d.width + padding.width; + size.width = std::max(size.width, d.width + padding.width); break; } + case WID_NCL_NAME: + size.width += Window::SortButtonWidth() * 2; + break; + case WID_NCL_MATRIX: fill.height = resize.height = std::max(this->checkbox_size.height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height; size.height = 10 * resize.height;