mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-17 09:22:42 +01:00
Change: Support interface scaling in network client list buttons.
This commit is contained in:
committed by
Peter Nelson
parent
cb1c2409e6
commit
81530e2574
@@ -1339,7 +1339,7 @@ public:
|
||||
colour(colour),
|
||||
disabled(disabled)
|
||||
{
|
||||
Dimension d = GetSpriteSize(sprite);
|
||||
Dimension d = GetScaledSpriteSize(sprite);
|
||||
this->height = d.height + WidgetDimensions::scaled.framerect.Vertical();
|
||||
this->width = d.width + WidgetDimensions::scaled.framerect.Horizontal();
|
||||
}
|
||||
@@ -1463,7 +1463,7 @@ public:
|
||||
bool rtl = _current_text_dir == TD_RTL;
|
||||
r = this->DrawButtons(r);
|
||||
|
||||
Dimension d = GetSpriteSize(SPR_COMPANY_ICON);
|
||||
Dimension d = GetScaledSpriteSize(SPR_COMPANY_ICON);
|
||||
PaletteID pal = Company::IsValidID(this->company_id) ? GetCompanyPalette(this->company_id) : PALETTE_TO_GREY;
|
||||
DrawSpriteIgnorePadding(SPR_COMPANY_ICON, pal, r.WithWidth(d.width, rtl), SA_CENTER);
|
||||
|
||||
@@ -1503,7 +1503,7 @@ public:
|
||||
}
|
||||
|
||||
if (player_icon != 0) {
|
||||
Dimension d = GetSpriteSize(player_icon);
|
||||
Dimension d = GetScaledSpriteSize(player_icon);
|
||||
DrawSpriteIgnorePadding(player_icon, PALETTE_TO_GREY, r.WithWidth(d.width, rtl), SA_CENTER);
|
||||
tr = tr.Indent(d.width + WidgetDimensions::scaled.hsep_normal, rtl);
|
||||
}
|
||||
@@ -1514,7 +1514,7 @@ public:
|
||||
std::optional<EncodedString> GetTooltip(Rect r, const Point &pt) const override
|
||||
{
|
||||
bool rtl = _current_text_dir == TD_RTL;
|
||||
Dimension d = GetSpriteSize(SPR_PLAYER_SELF);
|
||||
Dimension d = GetScaledSpriteSize(SPR_PLAYER_SELF);
|
||||
|
||||
if (r.WithWidth(d.width, rtl).Contains(pt)) {
|
||||
const NetworkClientInfo *ci = NetworkClientInfo::GetIfValid(this->client_pool_id);
|
||||
@@ -1754,7 +1754,7 @@ public:
|
||||
break;
|
||||
|
||||
case WID_CL_MATRIX: {
|
||||
uint height = std::max({GetSpriteSize(SPR_COMPANY_ICON).height, GetSpriteSize(SPR_JOIN).height, GetSpriteSize(SPR_ADMIN).height, GetSpriteSize(SPR_CHAT).height});
|
||||
uint height = std::max({GetScaledSpriteSize(SPR_COMPANY_ICON).height, GetScaledSpriteSize(SPR_JOIN).height, GetScaledSpriteSize(SPR_ADMIN).height, GetScaledSpriteSize(SPR_CHAT).height});
|
||||
height += WidgetDimensions::scaled.framerect.Vertical();
|
||||
this->line_height = std::max(height, (uint)GetCharacterHeight(FS_NORMAL)) + padding.height;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user