dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag '13.0-beta2' into jgrpp

Browse Source 
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2022-12-04 20:25:38 +00:00
parent 02e19521bc 1c82200e0f
commit 6d4474b84e
172 changed files with 3061 additions and 2809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/zoning_gui.cpp
View File

@@ -24,9 +24,7 @@
#include "zoning.h"
enum ZoningToolbarWidgets {
ZTW_OUTER = 4,
ZTW_OUTER_DROPDOWN,
ZTW_INNER,
ZTW_INNER_DROPDOWN,
ZTW_CAPTION
};
@@ -138,6 +136,9 @@ struct ZoningWindow : public Window {
case ZTW_INNER_DROPDOWN:
strs = _zone_type_strings;
break;
default:
return;
}
if (strs != nullptr) {
while (*strs != INVALID_STRING_ID) {
@@ -145,7 +146,7 @@ struct ZoningWindow : public Window {
}
}
size->width += padding.width;
size->height = FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM;
size->height = FONT_HEIGHT_NORMAL + WidgetDimensions::scaled.dropdowntext.Vertical();
}
};
@@ -159,17 +160,13 @@ static const NWidgetPart _nested_zoning_widgets[] = {
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(NWID_HORIZONTAL, COLOUR_GREY), SetPIP(10, 3, 10),
NWidget(NWID_VERTICAL, COLOUR_GREY), SetPadding(5, 0, 5, 0),
NWidget(NWID_VERTICAL, COLOUR_GREY), SetPadding(5, 0, 5, 0), SetPIP(0, 5, 0),
NWidget(WWT_TEXT, COLOUR_GREY), SetDataTip(STR_ZONING_OUTER, STR_NULL), SetResize(1, 0), SetPadding(1, 6, 1, 6),
NWidget(WWT_TEXT, COLOUR_GREY, ZTW_OUTER),
NWidget(WWT_TEXT, COLOUR_GREY), SetDataTip(STR_ZONING_INNER, STR_NULL), SetResize(1, 0), SetPadding(1, 6, 1, 6),
NWidget(WWT_TEXT, COLOUR_GREY, ZTW_INNER),
EndContainer(),
NWidget(NWID_VERTICAL, COLOUR_GREY), SetPadding(5, 0, 5, 0),
NWidget(NWID_VERTICAL, COLOUR_GREY), SetPadding(5, 0, 5, 0), SetPIP(0, 5, 0),
NWidget(WWT_DROPDOWN, COLOUR_GREY, ZTW_OUTER_DROPDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXT, COLOUR_GREY),
NWidget(WWT_DROPDOWN, COLOUR_GREY, ZTW_INNER_DROPDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXT, COLOUR_GREY),
EndContainer(),
EndContainer(),
EndContainer()