cpp/openttd-patchpack/source Changeset - r7956:e44eea6d7dda

Changeset - r7956:e44eea6d7dda

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 17 years ago 2007-11-24 13:00:32
rubidium@openttd.org

(svn r11512) -Change: make the subsidy window able to resize to something smaller than 640x127 (especially the 640 part) when the screen is really too small.

2 files changed with 16 insertions and 15 deletions:

src/road_gui.cpp

src/subsidy_gui.cpp

0 comments (0 inline, 0 general)

src/road_gui.cpp

➞

Show inline comments

@@ @@ -212,7 +212,7 @@ static void PlaceRoadStop(TileIndex tile @@
 static void PlaceRoad_BusStation(TileIndex tile)
+{
-	if (_remove_button_clicked || _ctrl_pressed) {
 	if (_remove_button_clicked) {
 		DoCommandP(tile, 0, RoadStop::BUS, CcPlaySound1D, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[RoadStop::BUS]));
 	} else {
 		PlaceRoadStop(tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | RoadStop::BUS, CMD_BUILD_ROAD_STOP | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[RoadStop::BUS]));
@@ @@ -221,7 +221,7 @@ static void PlaceRoad_BusStation(TileInd @@
 static void PlaceRoad_TruckStation(TileIndex tile)
+{
-	if (_remove_button_clicked || _ctrl_pressed) {
 	if (_remove_button_clicked) {
 		DoCommandP(tile, 0, RoadStop::TRUCK, CcPlaySound1D, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[RoadStop::TRUCK]));
 	} else {
 		PlaceRoadStop(tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | RoadStop::TRUCK, CMD_BUILD_ROAD_STOP | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[RoadStop::TRUCK]));

src/subsidy_gui.cpp

➞

Show inline comments

@@ @@ -92,9 +92,10 @@ static void DrawSubsidiesWindow(const Wi @@
 	ConvertDateToYMD(_date, &ymd);
 	int width = w->width - 2;
 	y = 15;
 	x = 1;
-	DrawString(x, y, STR_2026_SUBSIDIES_ON_OFFER_FOR, TC_FROMSTRING);
+	DrawStringTruncated(x, y, STR_2026_SUBSIDIES_ON_OFFER_FOR, TC_FROMSTRING, width);
 	y += 10;
 	num = 0;
@@ @@ -103,21 +104,21 @@ static void DrawSubsidiesWindow(const Wi @@
 			int x2;
 			SetupSubsidyDecodeParam(s, 1);
-			x2 = DrawString(x + 2, y, STR_2027_FROM_TO, TC_FROMSTRING);
+			x2 = DrawStringTruncated(x + 2, y, STR_2027_FROM_TO, TC_FROMSTRING, width);
 			SetDParam(0, _date - ymd.day + 384 - s->age * 32);
-			DrawString(x2, y, STR_2028_BY, TC_FROMSTRING);
+			DrawStringTruncated(x2, y, STR_2028_BY, TC_FROMSTRING, width - x2);
 			y += 10;
 			num++;
+		}
+	}
 	if (num == 0) {
-		DrawString(x + 2, y, STR_202A_NONE, TC_FROMSTRING);
+		DrawStringTruncated(x + 2, y, STR_202A_NONE, TC_FROMSTRING, width - 2);
 		y += 10;
+	}
-	DrawString(x, y + 1, STR_202B_SERVICES_ALREADY_SUBSIDISED, TC_FROMSTRING);
+	DrawStringTruncated(x, y + 1, STR_202B_SERVICES_ALREADY_SUBSIDISED, TC_FROMSTRING, width);
 	y += 10;
 	num = 0;
@@ @@ -130,16 +131,16 @@ static void DrawSubsidiesWindow(const Wi @@
 			PlayerID player = GetStation(s->to)->owner;
 			SetDParam(3, player);
-			xt = DrawString(x + 2, y, STR_202C_FROM_TO, TC_FROMSTRING);
+			xt = DrawStringTruncated(x + 2, y, STR_202C_FROM_TO, TC_FROMSTRING, width - 2);
 			SetDParam(0, _date - ymd.day + 768 - s->age * 32);
-			DrawString(xt, y, STR_202D_UNTIL, TC_FROMSTRING);
+			DrawStringTruncated(xt, y, STR_202D_UNTIL, TC_FROMSTRING, width - xt);
 			y += 10;
 			num++;
+		}
+	}
-	if (num == 0) DrawString(x + 2, y, STR_202A_NONE, TC_FROMSTRING);
+	if (num == 0) DrawStringTruncated(x + 2, y, STR_202A_NONE, TC_FROMSTRING, width - 2);
+}
 static void SubsidiesListWndProc(Window *w, WindowEvent *e)
@@ @@ -158,15 +159,15 @@ static void SubsidiesListWndProc(Window @@
+}
 static const Widget _subsidies_list_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE, 13,   0,  10,   0,  13, STR_00C5,           STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE, 13,  11, 617,   0,  13, STR_2025_SUBSIDIES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX,   RESIZE_NONE, 13, 618, 629,   0,  13, STR_NULL,           STR_STICKY_BUTTON},
 {      WWT_PANEL,   RESIZE_NONE, 13,   0, 629,  14, 126, 0x0,                STR_01FD_CLICK_ON_SERVICE_TO_CENTER},
 {   WWT_CLOSEBOX, RESIZE_NONE,  13,   0,  10,   0,  13, STR_00C5,           STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION, RESIZE_RIGHT, 13,  11, 307,   0,  13, STR_2025_SUBSIDIES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_STICKYBOX, RESIZE_LR,    13, 308, 319,   0,  13, STR_NULL,           STR_STICKY_BUTTON},
 {      WWT_PANEL, RESIZE_RIGHT, 13,   0, 319,  14, 126, 0x0,                STR_01FD_CLICK_ON_SERVICE_TO_CENTER},
 {   WIDGETS_END},
 };
 static const WindowDesc _subsidies_list_desc = {
-	WDP_AUTO, WDP_AUTO, 630, 127, 630, 127,
+	WDP_AUTO, WDP_AUTO, 320, 127, 630, 127,
 	WC_SUBSIDIES_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_subsidies_list_widgets,

0 comments (0 inline, 0 general)