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

Merge branch 'vehicle_group_info' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-03 15:22:50 +00:00
parent 30d8cb2d4c b45e721faa
commit f9d4213a3a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/group_gui.cpp
View File

@@ -193,7 +193,7 @@ private:
uint ComputeGroupInfoSize() uint ComputeGroupInfoSize()
{ {
this->column_size[VGC_NAME] = maxdim(GetStringBoundingBox(STR_GROUP_DEFAULT_TRAINS + this->vli.vtype), GetStringBoundingBox(STR_GROUP_ALL_TRAINS + this->vli.vtype)); this->column_size[VGC_NAME] = maxdim(GetStringBoundingBox(STR_GROUP_DEFAULT_TRAINS + this->vli.vtype), GetStringBoundingBox(STR_GROUP_ALL_TRAINS + this->vli.vtype));
this->column_size[VGC_NAME].width = max(170u, this->column_size[VGC_NAME].width); this->column_size[VGC_NAME].width = max((170u * FONT_HEIGHT_NORMAL) / 10u, this->column_size[VGC_NAME].width);
this->tiny_step_height = this->column_size[VGC_NAME].height; this->tiny_step_height = this->column_size[VGC_NAME].height;
this->column_size[VGC_PROTECT] = GetSpriteSize(SPR_GROUP_REPLACE_PROTECT); this->column_size[VGC_PROTECT] = GetSpriteSize(SPR_GROUP_REPLACE_PROTECT);
@@ -373,7 +373,7 @@ public:
max_icon_height = max(max_icon_height, GetSpriteSize(this->GetWidget<NWidgetCore>(WID_GL_REPLACE_PROTECTION)->widget_data).height); max_icon_height = max(max_icon_height, GetSpriteSize(this->GetWidget<NWidgetCore>(WID_GL_REPLACE_PROTECTION)->widget_data).height);
/* ... minus the height of the group info ... */ /* ... minus the height of the group info ... */
max_icon_height += 37; max_icon_height += (FONT_HEIGHT_NORMAL * 3) + 7;
/* Get a multiple of tiny_step_height of that amount */ /* Get a multiple of tiny_step_height of that amount */
size->height = Ceil(size->height - max_icon_height, tiny_step_height); size->height = Ceil(size->height - max_icon_height, tiny_step_height);
@@ -407,6 +407,11 @@ public:
*size = maxdim(*size, d); *size = maxdim(*size, d);
break; break;
} }
case WID_GL_INFO: {
size->height = (FONT_HEIGHT_NORMAL * 3) + 7;
break;
}
} }
} }