(svn r20170) -Codechange: Add BaseVehicleListWindow::GetActionDropdownSize().

This commit is contained in:
frosch 2010-07-17 14:47:54 +00:00
parent c79d4f46a3
commit ce480fb4b5
3 changed files with 23 additions and 5 deletions

View File

@ -236,11 +236,7 @@ public:
break;
case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
static const StringID _dropdown_text[] = {STR_VEHICLE_LIST_REPLACE_VEHICLES, STR_VEHICLE_LIST_SEND_FOR_SERVICING, STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT, STR_GROUP_ADD_SHARED_VEHICLE, STR_GROUP_REMOVE_ALL_VEHICLES};
Dimension d = {0, 0};
for (const StringID *sid = _dropdown_text; sid != endof(_dropdown_text); sid++) {
d = maxdim(d, GetStringBoundingBox(*sid));
}
Dimension d = this->GetActionDropdownSize(true);
d.height += padding.height;
d.width += padding.width;
*size = maxdim(*size, d);

View File

@ -125,6 +125,27 @@ void BaseVehicleListWindow::BuildVehicleList(Owner owner, uint16 index, uint16 w
this->vscroll.SetCount(this->vehicles.Length());
}
/**
* Compute the size for the Action dropdown.
* @param show_group If true include group-related stuff.
* @return Required size.
*/
Dimension BaseVehicleListWindow::GetActionDropdownSize(bool show_group)
{
Dimension d = {0, 0};
d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_REPLACE_VEHICLES));
d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_SEND_FOR_SERVICING));
d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT));
if (show_group) {
d = maxdim(d, GetStringBoundingBox(STR_GROUP_ADD_SHARED_VEHICLE));
d = maxdim(d, GetStringBoundingBox(STR_GROUP_REMOVE_ALL_VEHICLES));
}
return d;
}
/**
* Display the Action dropdown window.
* @param show_group If true include group-related stuff.

View File

@ -43,6 +43,7 @@ struct BaseVehicleListWindow : public Window {
void DrawVehicleListItems(VehicleID selected_vehicle, int line_height, const Rect &r) const;
void SortVehicleList();
void BuildVehicleList(Owner owner, uint16 index, uint16 window_type);
Dimension GetActionDropdownSize(bool show_group);
DropDownList *BuildActionDropdownList(bool show_group);
};