mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14329) -Fix (r14306): selections in the group GUI weren't shown anymore.

release/0.7
rubidium 2008-09-15 10:02:39 +00:00
parent 6be25eabb3
commit 1ce4e5721b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/group_gui.cpp
View File

@ -440,7 +440,7 @@ public:
this->DrawSortButtonState(GRP_WIDGET_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP); this->DrawSortButtonState(GRP_WIDGET_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
this->DrawVehicleListItems(x); this->DrawVehicleListItems(x, this->vehicle_sel);
} }
virtual void OnClick(Point pt, int widget) virtual void OnClick(Point pt, int widget)

7
src/vehicle_gui.cpp
View File

@ -741,8 +741,9 @@ static void DrawVehicleImage(const Vehicle *v, int x, int y, VehicleID selection
/** /**
* Draw all the vehicle list items. * Draw all the vehicle list items.
* @param x the position from where to draw the items. * @param x the position from where to draw the items.
* @param selected_vehicle the vehicle that is to be selected
*/ */
void BaseVehicleListWindow::DrawVehicleListItems(int x) void BaseVehicleListWindow::DrawVehicleListItems(int x, VehicleID selected_vehicle)
{ {
int y = PLY_WND_PRC__OFFSET_TOP_WIDGET; int y = PLY_WND_PRC__OFFSET_TOP_WIDGET;
uint max = min(this->vscroll.pos + this->vscroll.cap, this->vehicles.Length()); uint max = min(this->vscroll.pos + this->vscroll.cap, this->vehicles.Length());
@ -753,7 +754,7 @@ void BaseVehicleListWindow::DrawVehicleListItems(int x)
SetDParam(0, v->GetDisplayProfitThisYear()); SetDParam(0, v->GetDisplayProfitThisYear());
SetDParam(1, v->GetDisplayProfitLastYear()); SetDParam(1, v->GetDisplayProfitLastYear());
DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, this->widget[VLW_WIDGET_LIST].right - this->widget[VLW_WIDGET_LIST].left - 20, 0); DrawVehicleImage(v, x + 19, y + 6, selected_vehicle, this->widget[VLW_WIDGET_LIST].right - this->widget[VLW_WIDGET_LIST].left - 20, 0);
DrawString(x + 19, y + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING); DrawString(x + 19, y + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
if (v->name != NULL) { if (v->name != NULL) {
@ -992,7 +993,7 @@ struct VehicleListWindow : public BaseVehicleListWindow {
/* draw arrow pointing up/down for ascending/descending sorting */ /* draw arrow pointing up/down for ascending/descending sorting */
this->DrawSortButtonState(VLW_WIDGET_SORT_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP); this->DrawSortButtonState(VLW_WIDGET_SORT_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
this->DrawVehicleListItems(x); this->DrawVehicleListItems(x, INVALID_VEHICLE);
} }
virtual void OnClick(Point pt, int widget) virtual void OnClick(Point pt, int widget)

2
src/vehicle_gui_base.h
View File

@ -30,7 +30,7 @@ struct BaseVehicleListWindow: public Window {
this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs); this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs);
} }
void DrawVehicleListItems(int x); void DrawVehicleListItems(int x, VehicleID selected_vehicle);
void SortVehicleList(); void SortVehicleList();
void BuildVehicleList(PlayerID owner, uint16 index, uint16 window_type); void BuildVehicleList(PlayerID owner, uint16 index, uint16 window_type);
}; };