From c457dc680bf6ec307c5fb96927251f3c4238abf8 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 4 Dec 2022 22:02:26 +0000 Subject: [PATCH] Adjust height of vehicle list items in vehicle lists --- src/group_gui.cpp | 2 +- src/tracerestrict_gui.cpp | 3 ++- src/vehicle_gui.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 52588db83e..0e4ec5e1e2 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -263,7 +263,7 @@ private: this->column_size[VGC_NUMBER] = GetStringBoundingBox(STR_GROUP_COUNT_WITH_SUBGROUP); this->tiny_step_height = std::max(this->tiny_step_height, this->column_size[VGC_NUMBER].height); - this->tiny_step_height += WidgetDimensions::scaled.framerect.Vertical() + 1; + this->tiny_step_height += WidgetDimensions::scaled.framerect.Vertical() + ScaleGUITrad(2); return WidgetDimensions::scaled.framerect.left + this->column_size[VGC_FOLD].width + WidgetDimensions::scaled.hsep_normal + diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index 452413cde5..97b6f5c26d 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -45,6 +45,7 @@ #include "toolbar_gui.h" #include "core/geometry_func.hpp" #include "infrastructure_func.h" +#include "zoom_func.h" #include "safeguards.h" @@ -3604,7 +3605,7 @@ private: this->column_size[VGC_NUMBER] = GetStringBoundingBox(STR_TRACE_RESTRICT_SLOT_MAX_OCCUPANCY); this->tiny_step_height = std::max(this->tiny_step_height, this->column_size[VGC_NUMBER].height); - this->tiny_step_height += WidgetDimensions::scaled.matrix.top; + this->tiny_step_height += WidgetDimensions::scaled.matrix.top + ScaleGUITrad(1); return WidgetDimensions::scaled.framerect.Horizontal() + WidgetDimensions::scaled.vsep_wide + this->column_size[VGC_NAME].width + WidgetDimensions::scaled.vsep_wide + diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 3c548fd7ec..cd22bb55e7 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1782,9 +1782,9 @@ void DrawVehicleImage(const Vehicle *v, const Rect &r, VehicleID selection, Engi uint GetVehicleListHeight(VehicleType type, uint divisor) { /* Name + vehicle + profit */ - uint base = ScaleGUITrad(GetVehicleHeight(type)) + 2 * FONT_HEIGHT_SMALL; + uint base = ScaleGUITrad(GetVehicleHeight(type)) + 2 * FONT_HEIGHT_SMALL + ScaleGUITrad(1); /* Drawing of the 4 small orders + profit*/ - if (type >= VEH_SHIP) base = std::max(base, 5U * FONT_HEIGHT_SMALL); + if (type >= VEH_SHIP) base = std::max(base, 5U * FONT_HEIGHT_SMALL + ScaleGUITrad(1)); if (divisor == 1) return base;