dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partially revert 8e539ce2: Fix train/RV spacing at normal zoom

Browse Source 
See: https://github.com/OpenTTD/OpenTTD/pull/9041
This commit is contained in:
Jonathan G Rennison
2021-04-25 01:07:31 +01:00
parent 1e4161ff56
commit f83b71828e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/group_gui.cpp
View File

@@ -263,7 +263,7 @@ private:
this->column_size[VGC_NUMBER] = GetStringBoundingBox(STR_GROUP_COUNT_WITH_SUBGROUP); 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 = std::max(this->tiny_step_height, this->column_size[VGC_NUMBER].height);
this->tiny_step_height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; this->tiny_step_height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 1;
return WD_FRAMERECT_LEFT + 8 + return WD_FRAMERECT_LEFT + 8 +
this->column_size[VGC_FOLD].width + 2 + this->column_size[VGC_FOLD].width + 2 +
@@ -636,11 +636,11 @@ public:
{ {
switch (widget) { switch (widget) {
case WID_GL_ALL_VEHICLES: case WID_GL_ALL_VEHICLES:
DrawGroupInfo(r.top, r.left, r.right, ALL_GROUP); DrawGroupInfo(r.top + WD_FRAMERECT_TOP, r.left, r.right, ALL_GROUP);
break; break;
case WID_GL_DEFAULT_VEHICLES: case WID_GL_DEFAULT_VEHICLES:
DrawGroupInfo(r.top, r.left, r.right, DEFAULT_GROUP); DrawGroupInfo(r.top + WD_FRAMERECT_TOP, r.left, r.right, DEFAULT_GROUP);
break; break;
case WID_GL_INFO: { case WID_GL_INFO: {
@@ -668,7 +668,7 @@ public:
} }
case WID_GL_LIST_GROUP: { case WID_GL_LIST_GROUP: {
int y1 = r.top; int y1 = r.top + WD_FRAMERECT_TOP;
int max = std::min<size_t>(this->group_sb->GetPosition() + this->group_sb->GetCapacity(), this->groups.size()); int max = std::min<size_t>(this->group_sb->GetPosition() + this->group_sb->GetCapacity(), this->groups.size());
for (int i = this->group_sb->GetPosition(); i < max; ++i) { for (int i = this->group_sb->GetPosition(); i < max; ++i) {
const Group *g = this->groups[i]; const Group *g = this->groups[i];