Changeset - r27251:32eeeb197cbd
[Not reviewed]
master
0 2 0
glx22 - 17 months ago 2023-04-28 15:02:34
glx@openttd.org
Codechange: Remove STR_TINY_RIGHT_ARROW
2 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/lang/english.txt
Show inline comments
 
@@ -5582,44 +5582,44 @@ STR_DEPOT_NAME                          
 
STR_ENGINE_NAME                                                 :{ENGINE}
 
STR_HIDDEN_ENGINE_NAME                                          :{ENGINE} (hidden)
 
STR_GROUP_NAME                                                  :{GROUP}
 
STR_INDUSTRY_NAME                                               :{INDUSTRY}
 
STR_PRESIDENT_NAME                                              :{PRESIDENT_NAME}
 
STR_SIGN_NAME                                                   :{SIGN}
 
STR_STATION_NAME                                                :{STATION}
 
STR_TOWN_NAME                                                   :{TOWN}
 
STR_VEHICLE_NAME                                                :{VEHICLE}
 
STR_WAYPOINT_NAME                                               :{WAYPOINT}
 

	
 
STR_JUST_CARGO                                                  :{CARGO_LONG}
 
STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 
STR_JUST_CHECKMARK                                              :{CHECKMARK}
 
STR_JUST_COMMA                                                  :{COMMA}
 
STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 
STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
 
STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 
STR_JUST_DECIMAL                                                :{DECIMAL}
 
STR_JUST_INT                                                    :{NUM}
 
STR_JUST_DATE_TINY                                              :{DATE_TINY}
 
STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 
STR_JUST_DATE_LONG                                              :{DATE_LONG}
 
STR_JUST_DATE_ISO                                               :{DATE_ISO}
 
STR_JUST_STRING                                                 :{STRING}
 
STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 
STR_JUST_RAW_STRING                                             :{RAW_STRING}
 
STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{RAW_STRING}
 

	
 
# Slightly 'raw' stringcodes with colour or size
 
STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 
STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 
STR_TINY_RIGHT_ARROW                                            :{TINY_FONT}{RIGHT_ARROW}
 

	
 
STR_BLACK_1                                                     :{BLACK}1
 
STR_BLACK_2                                                     :{BLACK}2
 
STR_BLACK_3                                                     :{BLACK}3
 
STR_BLACK_4                                                     :{BLACK}4
 
STR_BLACK_5                                                     :{BLACK}5
 
STR_BLACK_6                                                     :{BLACK}6
 
STR_BLACK_7                                                     :{BLACK}7
 

	
 
STR_TRAIN                                                       :{BLACK}{TRAIN}
 
STR_BUS                                                         :{BLACK}{BUS}
 
STR_LORRY                                                       :{BLACK}{LORRY}
src/vehicle_gui.cpp
Show inline comments
 
@@ -354,25 +354,25 @@ Dimension BaseVehicleListWindow::GetActi
 
	d = maxdim(d, GetStringBoundingBox(this->vehicle_depot_name[this->vli.vtype]));
 

	
 
	if (show_group) {
 
		d = maxdim(d, GetStringBoundingBox(STR_GROUP_ADD_SHARED_VEHICLE));
 
		d = maxdim(d, GetStringBoundingBox(STR_GROUP_REMOVE_ALL_VEHICLES));
 
	}
 

	
 
	return d;
 
}
 

	
 
void BaseVehicleListWindow::OnInit()
 
{
 
	this->order_arrow_width = GetStringBoundingBox(STR_TINY_RIGHT_ARROW).width;
 
	this->order_arrow_width = GetStringBoundingBox(STR_JUST_RIGHT_ARROW, FS_SMALL).width;
 
	this->SetCargoFilterArray();
 
}
 

	
 
/**
 
 * Display the Action dropdown window.
 
 * @param show_autoreplace If true include the autoreplace item.
 
 * @param show_group If true include group-related stuff.
 
 * @return Itemlist for dropdown
 
 */
 
DropDownList BaseVehicleListWindow::BuildActionDropdownList(bool show_autoreplace, bool show_group)
 
{
 
	DropDownList list;
 
@@ -1551,25 +1551,25 @@ static const NWidgetPart _nested_vehicle
 
static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y, uint order_arrow_width, VehicleOrderID start)
 
{
 
	const Order *order = v->GetOrder(start);
 
	if (order == nullptr) return;
 

	
 
	bool rtl = _current_text_dir == TD_RTL;
 
	int l_offset = rtl ? 0 : order_arrow_width;
 
	int r_offset = rtl ? order_arrow_width : 0;
 
	int i = 0;
 
	VehicleOrderID oid = start;
 

	
 
	do {
 
		if (oid == v->cur_real_order_index) DrawString(left, right, y, STR_TINY_RIGHT_ARROW, TC_BLACK);
 
		if (oid == v->cur_real_order_index) DrawString(left, right, y, STR_JUST_RIGHT_ARROW, TC_BLACK, SA_LEFT, false, FS_SMALL);
 

	
 
		if (order->IsType(OT_GOTO_STATION)) {
 
			SetDParam(0, order->GetDestination());
 
			DrawString(left + l_offset, right - r_offset, y, STR_STATION_NAME, TC_BLACK, SA_LEFT, false, FS_SMALL);
 

	
 
			y += FONT_HEIGHT_SMALL;
 
			if (++i == 4) break;
 
		}
 

	
 
		oid++;
 
		order = order->next;
 
		if (order == nullptr) {
0 comments (0 inline, 0 general)