cpp/openttd-patchpack/source Changeset - r10143:a762ad08a77e

Changeset - r10143:a762ad08a77e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-09-15 10:02:39
rubidium@openttd.org

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

3 files changed with 6 insertions and 5 deletions:

src/group_gui.cpp

src/vehicle_gui.cpp

src/vehicle_gui_base.h

0 comments (0 inline, 0 general)

src/group_gui.cpp

➞

Show inline comments

@@ @@ -440,7 +440,7 @@ public: @@
 		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)

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -741,8 +741,9 @@ static void DrawVehicleImage(const Vehic @@
 /**
  * Draw all the vehicle list 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;
 	uint max = min(this->vscroll.pos + this->vscroll.cap, this->vehicles.Length());
@@ @@ -753,7 +754,7 @@ void BaseVehicleListWindow::DrawVehicleL @@
 		SetDParam(0, v->GetDisplayProfitThisYear());
 		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);
 		if (v->name != NULL) {
@@ @@ -992,7 +993,7 @@ struct VehicleListWindow : public BaseVe @@
 		/* draw arrow pointing up/down for ascending/descending sorting */
 		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)

src/vehicle_gui_base.h

➞

Show inline comments

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

0 comments (0 inline, 0 general)