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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/autoreplace_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/debug.cpp
#	src/engine_gui.h
#	src/error_gui.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot_gui.cpp
#	src/sound/win32_s.cpp
#	src/statusbar_gui.cpp
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2024-05-31 18:43:32 +01:00
parent c6c7191b16 90ca3515da
commit 32b8ec34ff
148 changed files with 1821 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plans_gui.cpp
View File

@@ -349,25 +349,25 @@ struct PlansWindow : Window {
this->vscroll->SetCapacityFromWidget(this, WID_PLN_LIST, WidgetDimensions::scaled.framerect.Vertical());
}
virtual void UpdateWidgetSize(WidgetID widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
virtual void UpdateWidgetSize(WidgetID widget, Dimension &size, const Dimension &padding, Dimension &fill, Dimension &resize) override
{
switch (widget) {
case WID_PLN_LIST:
this->company_icon_spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
resize->height = std::max<int>(GetCharacterHeight(FS_NORMAL), SETTING_BUTTON_HEIGHT);
size->height = resize->height * 5 + WidgetDimensions::scaled.framerect.Vertical();
resize.height = std::max<int>(GetCharacterHeight(FS_NORMAL), SETTING_BUTTON_HEIGHT);
size.height = resize.height * 5 + WidgetDimensions::scaled.framerect.Vertical();
break;
case WID_PLN_NEW:
*size = adddim(maxdim(GetStringBoundingBox(STR_PLANS_NEW_PLAN), GetStringBoundingBox(STR_PLANS_ADDING_LINES)), padding);
size = adddim(maxdim(GetStringBoundingBox(STR_PLANS_NEW_PLAN), GetStringBoundingBox(STR_PLANS_ADDING_LINES)), padding);
break;
case WID_PLN_ADD_LINES:
*size = adddim(GetStringBoundingBox(STR_PLANS_ADD_LINES), padding);
size = adddim(GetStringBoundingBox(STR_PLANS_ADD_LINES), padding);
break;
case WID_PLN_VISIBILITY:
*size = adddim(maxdim(GetStringBoundingBox(STR_PLANS_VISIBILITY_PRIVATE), GetStringBoundingBox(STR_PLANS_VISIBILITY_PUBLIC)), padding);
size = adddim(maxdim(GetStringBoundingBox(STR_PLANS_VISIBILITY_PRIVATE), GetStringBoundingBox(STR_PLANS_VISIBILITY_PUBLIC)), padding);
break;
case WID_PLN_COLOUR: {
@@ -375,20 +375,20 @@ struct PlansWindow : Window {
for (uint8_t colour = COLOUR_BEGIN; colour != COLOUR_END; ++colour) {
dim = maxdim(dim, GetStringBoundingBox(STR_COLOUR_DARK_BLUE + colour));
}
*size = adddim(dim, padding);
size = adddim(dim, padding);
break;
}
case WID_PLN_DELETE:
*size = adddim(GetStringBoundingBox(STR_PLANS_DELETE), padding);
size = adddim(GetStringBoundingBox(STR_PLANS_DELETE), padding);
break;
case WID_PLN_RENAME:
*size = adddim(GetStringBoundingBox(STR_BUTTON_RENAME), padding);
size = adddim(GetStringBoundingBox(STR_BUTTON_RENAME), padding);
break;
case WID_PLN_TAKE_OWNERSHIP:
*size = adddim(GetStringBoundingBox(STR_PLANS_TAKE_OWNERSHIP), padding);
size = adddim(GetStringBoundingBox(STR_PLANS_TAKE_OWNERSHIP), padding);
break;
}
}