From 3e86f337a80ba56faaf1fb5ab55a84a4aa7bdd97 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 13 Sep 2022 18:11:00 +0100 Subject: [PATCH] Change: Simplify graph's company key window. --- src/graph_gui.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 4779f811a8..e5e09aa66b 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -110,14 +110,15 @@ struct GraphLegendWindow : Window { */ static NWidgetBase *MakeNWidgetCompanyLines(int *biggest_index) { - NWidgetVertical *vert = new NWidgetVertical(); + NWidgetVertical *vert = new NWidgetVertical(NC_EQUALSIZE); + vert->SetPadding(2, 2, 2, 2); uint sprite_height = GetSpriteSize(SPR_COMPANY_ICON, nullptr, ZOOM_LVL_OUT_4X).height; for (int widnum = WID_GL_FIRST_COMPANY; widnum <= WID_GL_LAST_COMPANY; widnum++) { NWidgetBackground *panel = new NWidgetBackground(WWT_PANEL, COLOUR_BROWN, widnum); - panel->SetMinimalSize(246, sprite_height); + panel->SetMinimalSize(246, sprite_height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM); panel->SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM, FS_NORMAL); - panel->SetFill(1, 0); + panel->SetFill(1, 1); panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP); vert->Add(panel); } @@ -133,13 +134,7 @@ static const NWidgetPart _nested_graph_legend_widgets[] = { NWidget(WWT_STICKYBOX, COLOUR_BROWN), EndContainer(), NWidget(WWT_PANEL, COLOUR_BROWN, WID_GL_BACKGROUND), - NWidget(NWID_SPACER), SetMinimalSize(0, 2), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetMinimalSize(2, 0), - NWidgetFunction(MakeNWidgetCompanyLines), - NWidget(NWID_SPACER), SetMinimalSize(2, 0), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 2), + NWidgetFunction(MakeNWidgetCompanyLines), EndContainer(), };