diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 479dfcd0e4..0c171330e2 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -225,7 +225,7 @@ static void DrawPrice(Money amount, int left, int right, int top, TextColour col amount = -amount; str = STR_FINANCES_POSITIVE_INCOME; } - DrawString(left, right, top, GetString(str, amount), colour, SA_RIGHT); + DrawString(left, right, top, GetString(str, amount), colour, SA_RIGHT | SA_FORCE); } /** @@ -267,7 +267,7 @@ static void DrawYearColumn(const Rect &r, TimerGameEconomy::Year year, const Exp Money sum; /* Year header */ - DrawString(r.left, r.right, y, GetString(STR_FINANCES_YEAR, year), TC_FROMSTRING, SA_RIGHT, true); + DrawString(r.left, r.right, y, GetString(STR_FINANCES_YEAR, year), TC_FROMSTRING, SA_RIGHT | SA_FORCE, true); y += GetCharacterHeight(FS_NORMAL) + WidgetDimensions::scaled.vsep_wide; /* Categories */ @@ -310,10 +310,10 @@ static constexpr NWidgetPart _nested_company_finances_widgets[] = { NWidget(WWT_TEXT, INVALID_COLOUR), SetStringTip(STR_FINANCES_BANK_BALANCE_TITLE), SetPadding(WidgetDimensions::unscaled.vsep_normal, 0, 0, 0), EndContainer(), NWidget(NWID_VERTICAL), // Vertical column with bank balance amount, loan amount, and total. - NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_OWN_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT), - NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_LOAN_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT), + NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_OWN_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT | SA_FORCE), + NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_LOAN_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT | SA_FORCE), NWidget(WWT_EMPTY, INVALID_COLOUR, WID_CF_BALANCE_LINE), SetMinimalSize(0, WidgetDimensions::unscaled.vsep_normal), - NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_BALANCE_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT), + NWidget(WWT_TEXT, INVALID_COLOUR, WID_CF_BALANCE_VALUE), SetAlignment(SA_VERT_CENTER | SA_RIGHT | SA_FORCE), EndContainer(), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_CF_SEL_MAXLOAN), NWidget(NWID_VERTICAL), SetPIPRatio(0, 0, 1), // Max loan information @@ -1957,13 +1957,14 @@ struct CompanyInfrastructureWindow : Window */ void DrawCountLine(const Rect &r, int &y, int count, Money monthly_cost) const { - DrawString(r.left, r.right, y += GetCharacterHeight(FS_NORMAL), GetString(STR_JUST_COMMA, count), TC_WHITE, SA_RIGHT); + Rect cr = r.Indent(this->total_width, _current_text_dir == TD_RTL); + DrawString(cr.left, cr.right, y += GetCharacterHeight(FS_NORMAL), GetString(STR_JUST_COMMA, count), TC_WHITE, SA_RIGHT | SA_FORCE); if (_settings_game.economy.infrastructure_maintenance) { Rect tr = r.WithWidth(this->total_width, _current_text_dir == TD_RTL); DrawString(tr.left, tr.right, y, GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, monthly_cost * 12), - TC_FROMSTRING, SA_RIGHT); + TC_FROMSTRING, SA_RIGHT | SA_FORCE); } } @@ -2048,7 +2049,7 @@ struct CompanyInfrastructureWindow : Window y += WidgetDimensions::scaled.vsep_normal; DrawString(tr.left, tr.right, y, GetString(TimerGameEconomy::UsingWallclockUnits() ? STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_PERIOD : STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL_YEAR, this->GetTotalMaintenanceCost() * 12), - TC_FROMSTRING, SA_RIGHT); + TC_FROMSTRING, SA_RIGHT | SA_FORCE); } break; diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index 3eadefbad9..cd2b28111a 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -330,7 +330,7 @@ struct DepotWindow : Window { Rect count = text.WithWidth(this->count_width - WidgetDimensions::scaled.hsep_normal, !rtl); DrawString(count.left, count.right, count.bottom - GetCharacterHeight(FS_SMALL) + 1, GetString(STR_JUST_DECIMAL, CeilDiv(u->gcache.cached_total_length * 10, TILE_SIZE), 1), - TC_BLACK, SA_RIGHT, false, FS_SMALL); // Draw the counter + TC_BLACK, SA_RIGHT | SA_FORCE, false, FS_SMALL); // Draw the counter break; } diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp index daca369fc9..d69bf9941f 100644 --- a/src/framerate_gui.cpp +++ b/src/framerate_gui.cpp @@ -570,7 +570,7 @@ struct FramerateWindow : Window { if (skip > 0) { skip--; } else { - DrawString(r.left, r.right, y, GetString(values[e].strid, values[e].GetValue(), values[e].GetDecimals()), TC_FROMSTRING, SA_RIGHT); + DrawString(r.left, r.right, y, GetString(values[e].strid, values[e].GetValue(), values[e].GetDecimals()), TC_FROMSTRING, SA_RIGHT | SA_FORCE); y += GetCharacterHeight(FS_NORMAL); drawable--; if (drawable == 0) break; @@ -592,12 +592,12 @@ struct FramerateWindow : Window { skip--; } else if (e == PFE_GAMESCRIPT || e >= PFE_AI0) { uint64_t value = e == PFE_GAMESCRIPT ? Game::GetInstance()->GetAllocatedMemory() : Company::Get(e - PFE_AI0)->ai_instance->GetAllocatedMemory(); - DrawString(r.left, r.right, y, GetString(STR_FRAMERATE_BYTES_GOOD, value), TC_FROMSTRING, SA_RIGHT); + DrawString(r.left, r.right, y, GetString(STR_FRAMERATE_BYTES_GOOD, value), TC_FROMSTRING, SA_RIGHT | SA_FORCE); y += GetCharacterHeight(FS_NORMAL); drawable--; if (drawable == 0) break; } else if (e == PFE_SOUND) { - DrawString(r.left, r.right, y, GetString(STR_FRAMERATE_BYTES_GOOD, GetSoundPoolAllocatedMemory()), TC_FROMSTRING, SA_RIGHT); + DrawString(r.left, r.right, y, GetString(STR_FRAMERATE_BYTES_GOOD, GetSoundPoolAllocatedMemory()), TC_FROMSTRING, SA_RIGHT | SA_FORCE); y += GetCharacterHeight(FS_NORMAL); drawable--; if (drawable == 0) break; diff --git a/src/league_gui.cpp b/src/league_gui.cpp index 898f873056..52452e88ef 100644 --- a/src/league_gui.cpp +++ b/src/league_gui.cpp @@ -336,7 +336,7 @@ public: DrawString(rank_rect.left, rank_rect.right, ir.top + text_y_offset, GetString(STR_COMPANY_LEAGUE_COMPANY_RANK, rank + 1)); if (this->icon_size.width > 0 && lte->company != CompanyID::Invalid()) DrawCompanyIcon(lte->company, icon_rect.left, ir.top + icon_y_offset); DrawString(text_rect.left, text_rect.right, ir.top + text_y_offset, lte->text.GetDecodedString(), TC_BLACK); - DrawString(score_rect.left, score_rect.right, ir.top + text_y_offset, lte->score.GetDecodedString(), TC_BLACK, SA_RIGHT); + DrawString(score_rect.left, score_rect.right, ir.top + text_y_offset, lte->score.GetDecodedString(), TC_BLACK, SA_RIGHT | SA_FORCE); ir.top += this->line_height; }