(svn r6667) - Codechange: The vehicle list has no horizontal scroll bar, so don't use it to store data; instead, just get the widget's width.
authorpeter1138
Fri, 06 Oct 2006 08:47:01 +0000
changeset 4753 58daf74cb14f
parent 4752 3c305ece127c
child 4754 26ddeca70f94
(svn r6667) - Codechange: The vehicle list has no horizontal scroll bar, so don't use it to store data; instead, just get the widget's width.
vehicle_gui.c
--- a/vehicle_gui.c	Fri Oct 06 06:48:11 2006 +0000
+++ b/vehicle_gui.c	Fri Oct 06 08:47:01 2006 +0000
@@ -1471,7 +1471,6 @@
 
 	switch (vl->vehicle_type) {
 		case VEH_Train:
-			w->hscroll.cap = 10 * 29;
 			w->resize.step_width = 1;
 			/* Fallthrough */
 		case VEH_Road:
@@ -1626,7 +1625,7 @@
 		SetDParam(0, v->profit_this_year);
 		SetDParam(1, v->profit_last_year);
 
-		DrawVehicleImage(v, x + 19, y + 6, w->hscroll.cap + 2, 0, INVALID_VEHICLE);
+		DrawVehicleImage(v, x + 19, y + 6, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0, INVALID_VEHICLE);
 		DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, 0);
 
 		if ((v->type == VEH_Train    && v->string_id != STR_SV_TRAIN_NAME)   ||
@@ -1753,7 +1752,6 @@
 			break;
 
 		case WE_RESIZE: /* Update the scroll + matrix */
-			if (vl->vehicle_type == VEH_Train) w->hscroll.cap += e->we.sizing.diff.x;
 			w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
 			w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
 			ResizeVehicleListWidgets(w);