mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix 51fd2853cb: Different news widget layouts require different font sizes. (#13752)

pull/9953/merge
Peter Nelson 2025-03-08 12:00:56 +00:00 committed by GitHub
parent a154df6549
commit f8478cdee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/news_gui.cpp
View File

@ -120,6 +120,7 @@ static constexpr NWidgetPart _nested_normal_news_widgets[] = {
SetMinimalTextLines(8, 0, FS_LARGE), SetMinimalTextLines(8, 0, FS_LARGE),
SetMinimalSize(400, 0), SetMinimalSize(400, 0),
SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide), SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide),
SetTextStyle(TC_BLACK, FS_LARGE),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
@ -150,6 +151,7 @@ static constexpr NWidgetPart _nested_vehicle_news_widgets[] = {
SetMinimalSize(400, 0), SetMinimalSize(400, 0),
SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide), SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide),
SetStringTip(STR_EMPTY), SetStringTip(STR_EMPTY),
SetTextStyle(TC_BLACK, FS_LARGE),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_WHITE, WID_N_VEH_BKGND), SetPadding(WidgetDimensions::unscaled.fullbevel), NWidget(WWT_PANEL, COLOUR_WHITE, WID_N_VEH_BKGND), SetPadding(WidgetDimensions::unscaled.fullbevel),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
@ -196,6 +198,7 @@ static constexpr NWidgetPart _nested_company_news_widgets[] = {
SetMinimalTextLines(1, 0, FS_LARGE), SetMinimalTextLines(1, 0, FS_LARGE),
SetMinimalSize(400, 0), SetMinimalSize(400, 0),
SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_normal), SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_normal),
SetTextStyle(TC_BLACK, FS_LARGE),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0), SetPadding(2), NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_normal, 0), SetPadding(2),
@ -210,6 +213,7 @@ static constexpr NWidgetPart _nested_company_news_widgets[] = {
SetFill(1, 1), SetFill(1, 1),
SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide), SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_wide),
SetMinimalSize(300, 0), SetMinimalSize(300, 0),
SetTextStyle(TC_BLACK, FS_LARGE),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
@ -241,6 +245,7 @@ static constexpr NWidgetPart _nested_thin_news_widgets[] = {
SetMinimalTextLines(3, 0, FS_LARGE), SetMinimalTextLines(3, 0, FS_LARGE),
SetMinimalSize(400, 0), SetMinimalSize(400, 0),
SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_normal), SetPadding(WidgetDimensions::unscaled.hsep_indent, WidgetDimensions::unscaled.vsep_normal),
SetTextStyle(TC_BLACK, FS_LARGE),
EndContainer(), EndContainer(),
NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_N_VIEWPORT), SetMinimalSize(426, 70), NWidget(NWID_VIEWPORT, INVALID_COLOUR, WID_N_VIEWPORT), SetMinimalSize(426, 70),
SetPadding(WidgetDimensions::unscaled.fullbevel), SetPadding(WidgetDimensions::unscaled.fullbevel),
@ -279,6 +284,7 @@ static constexpr NWidgetPart _nested_small_news_widgets[] = {
NWidget(WWT_EMPTY, INVALID_COLOUR, WID_N_MESSAGE), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_N_MESSAGE),
SetMinimalTextLines(2, 0), SetMinimalTextLines(2, 0),
SetMinimalSize(275, 0), SetMinimalSize(275, 0),
SetTextStyle(TC_WHITE, FS_NORMAL),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
}; };
@ -442,7 +448,7 @@ struct NewsWindow : Window {
case WID_N_MESSAGE: case WID_N_MESSAGE:
case WID_N_COMPANY_MSG: case WID_N_COMPANY_MSG:
fontsize = FS_LARGE; fontsize = this->GetWidget<NWidgetLeaf>(widget)->GetFontSize();
str = this->ni->headline.GetDecodedString(); str = this->ni->headline.GetDecodedString();
break; break;
@ -514,9 +520,11 @@ struct NewsWindow : Window {
break; break;
case WID_N_MESSAGE: case WID_N_MESSAGE:
case WID_N_COMPANY_MSG: case WID_N_COMPANY_MSG: {
DrawStringMultiLine(r, this->ni->headline.GetDecodedString(), TC_BLACK, SA_CENTER, false, FS_LARGE); const NWidgetLeaf &nwid = *this->GetWidget<NWidgetLeaf>(widget);
DrawStringMultiLine(r, this->ni->headline.GetDecodedString(), nwid.GetTextColour(), SA_CENTER, false, nwid.GetFontSize());
break; break;
}
case WID_N_MGR_FACE: { case WID_N_MGR_FACE: {
const CompanyNewsInformation *cni = static_cast<const CompanyNewsInformation*>(this->ni->data.get()); const CompanyNewsInformation *cni = static_cast<const CompanyNewsInformation*>(this->ni->data.get());

3
src/widget_type.h
View File

@ -383,6 +383,9 @@ public:
inline void SetDisabled(bool disabled); inline void SetDisabled(bool disabled);
inline bool IsDisabled() const; inline bool IsDisabled() const;
inline TextColour GetTextColour() const { return this->text_colour; }
inline FontSize GetFontSize() const { return this->text_size; }
void FillWidgetLookup(WidgetLookup &widget_lookup) override; void FillWidgetLookup(WidgetLookup &widget_lookup) override;
NWidgetCore *GetWidgetFromPos(int x, int y) override; NWidgetCore *GetWidgetFromPos(int x, int y) override;
bool IsHighlighted() const override; bool IsHighlighted() const override;