diff options
| author | Peter Nelson <peter1138@openttd.org> | 2021-04-19 20:57:03 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2021-04-22 16:42:04 +0100 |
| commit | 994ffaa382ab14c9b80c5a0a5d704fa53b85d4d2 (patch) | |
| tree | 89cf5ec99abbeaa6f688a685ba12d9f593ba1f61 /src/company_gui.cpp | |
| parent | c361246bec11a3f7a913b73e25cae7bb53402834 (diff) | |
| download | openttd-994ffaa382ab14c9b80c5a0a5d704fa53b85d4d2.tar.xz | |
Codechange: Use alignment feature in company finances window.
Diffstat (limited to 'src/company_gui.cpp')
| -rw-r--r-- | src/company_gui.cpp | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index fd820199a..c9e3eaf86 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -242,10 +242,10 @@ static const NWidgetPart _nested_company_finances_widgets[] = { EndContainer(), NWidget(NWID_SPACER), SetFill(0, 0), SetMinimalSize(30, 0), NWidget(NWID_VERTICAL), // Vertical column with bank balance amount, loan amount, and total. - NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_BALANCE_VALUE), SetDataTip(STR_NULL, STR_NULL), - NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_LOAN_VALUE), SetDataTip(STR_NULL, STR_NULL), + NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_BALANCE_VALUE), SetDataTip(STR_FINANCES_TOTAL_CURRENCY, STR_NULL), SetAlignment(SA_VERT_CENTER | SA_RIGHT), + NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_LOAN_VALUE), SetDataTip(STR_FINANCES_TOTAL_CURRENCY, STR_NULL), SetAlignment(SA_VERT_CENTER | SA_RIGHT), NWidget(WWT_EMPTY, COLOUR_GREY, WID_CF_LOAN_LINE), SetMinimalSize(0, 2), SetFill(1, 0), - NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_TOTAL_VALUE), SetDataTip(STR_NULL, STR_NULL), + NWidget(WWT_TEXT, COLOUR_GREY, WID_CF_TOTAL_VALUE), SetDataTip(STR_FINANCES_TOTAL_CURRENCY, STR_NULL), SetAlignment(SA_VERT_CENTER | SA_RIGHT), EndContainer(), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_CF_SEL_MAXLOAN), NWidget(NWID_HORIZONTAL), @@ -292,6 +292,24 @@ struct CompanyFinancesWindow : Window { SetDParam(1, (CompanyID)this->window_number); break; + case WID_CF_BALANCE_VALUE: { + const Company *c = Company::Get((CompanyID)this->window_number); + SetDParam(0, c->money); + break; + } + + case WID_CF_LOAN_VALUE: { + const Company *c = Company::Get((CompanyID)this->window_number); + SetDParam(0, c->current_loan); + break; + } + + case WID_CF_TOTAL_VALUE: { + const Company *c = Company::Get((CompanyID)this->window_number); + SetDParam(0, c->money - c->current_loan); + break; + } + case WID_CF_MAXLOAN_VALUE: SetDParam(0, _economy.max_loan); break; @@ -350,27 +368,6 @@ struct CompanyFinancesWindow : Window { break; } - case WID_CF_BALANCE_VALUE: { - const Company *c = Company::Get((CompanyID)this->window_number); - SetDParam(0, c->money); - DrawString(r.left, r.right, r.top, STR_FINANCES_TOTAL_CURRENCY, TC_FROMSTRING, SA_RIGHT); - break; - } - - case WID_CF_LOAN_VALUE: { - const Company *c = Company::Get((CompanyID)this->window_number); - SetDParam(0, c->current_loan); - DrawString(r.left, r.right, r.top, STR_FINANCES_TOTAL_CURRENCY, TC_FROMSTRING, SA_RIGHT); - break; - } - - case WID_CF_TOTAL_VALUE: { - const Company *c = Company::Get((CompanyID)this->window_number); - SetDParam(0, c->money - c->current_loan); - DrawString(r.left, r.right, r.top, STR_FINANCES_TOTAL_CURRENCY, TC_FROMSTRING, SA_RIGHT); - break; - } - case WID_CF_LOAN_LINE: GfxFillRect(r.left, r.top, r.right, r.top, PC_BLACK); break; |