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

(svn r17754) -Codechange: Make ExpensesList::GetHeight() return a uint.

release/1.0
alberth 2009-10-10 13:32:44 +00:00
parent 2e2f3b1502
commit 402d0d05c9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/company_gui.cpp
View File

@ -83,14 +83,14 @@ static ExpensesType _expenses_list_2[] = {
/** Expense list container. */ /** Expense list container. */
struct ExpensesList { struct ExpensesList {
const ExpensesType *et; ///< Expenses items. const ExpensesType *et; ///< Expenses items.
const int length; ///< Number of items in list. const uint length; ///< Number of items in list.
const int num_subtotals; ///< Number of sub-totals in the list. const uint num_subtotals; ///< Number of sub-totals in the list.
ExpensesList(ExpensesType *et, int length, int num_subtotals) : et(et), length(length), num_subtotals(num_subtotals) ExpensesList(ExpensesType *et, int length, int num_subtotals) : et(et), length(length), num_subtotals(num_subtotals)
{ {
} }
int GetHeight() const uint GetHeight() const
{ {
/* top spacing + heading + line + texts of expenses + sub-totals + total line + total text + bottom spacing. */ /* top spacing + heading + line + texts of expenses + sub-totals + total line + total text + bottom spacing. */
return WD_FRAMERECT_TOP + FONT_HEIGHT_NORMAL + EXP_LINESPACE + return WD_FRAMERECT_TOP + FONT_HEIGHT_NORMAL + EXP_LINESPACE +
@ -134,7 +134,7 @@ static int DrawCategories(const Rect &r)
y += FONT_HEIGHT_NORMAL + EXP_LINESPACE; y += FONT_HEIGHT_NORMAL + EXP_LINESPACE;
int type = _settings_client.gui.expenses_layout; int type = _settings_client.gui.expenses_layout;
for (int i = 0; i < _expenses_list_types[type].length; i++) { for (uint i = 0; i < _expenses_list_types[type].length; i++) {
const ExpensesType et = _expenses_list_types[type].et[i]; const ExpensesType et = _expenses_list_types[type].et[i];
if (et == INVALID_EXPENSES) { if (et == INVALID_EXPENSES) {
y += EXP_LINESPACE; y += EXP_LINESPACE;
@ -184,7 +184,7 @@ static void DrawYearColumn(const Rect &r, int year, const Money (*tbl)[EXPENSES_
Money sum = 0; Money sum = 0;
Money subtotal = 0; Money subtotal = 0;
int type = _settings_client.gui.expenses_layout; int type = _settings_client.gui.expenses_layout;
for (int i = 0; i < _expenses_list_types[type].length; i++) { for (uint i = 0; i < _expenses_list_types[type].length; i++) {
const ExpensesType et = _expenses_list_types[type].et[i]; const ExpensesType et = _expenses_list_types[type].et[i];
if (et == INVALID_EXPENSES) { if (et == INVALID_EXPENSES) {
Money cost = subtotal; Money cost = subtotal;
@ -387,7 +387,7 @@ struct CompanyFinancesWindow : Window {
if (this->widget[CFW_EXPS_PANEL].bottom < this->widget[CFW_EXPS_PANEL].top) { if (this->widget[CFW_EXPS_PANEL].bottom < this->widget[CFW_EXPS_PANEL].top) {
this->widget[CFW_EXPS_PANEL].bottom = this->widget[CFW_EXPS_PANEL].top; this->widget[CFW_EXPS_PANEL].bottom = this->widget[CFW_EXPS_PANEL].top;
} }
int height = this->widget[CFW_EXPS_PANEL].bottom - this->widget[CFW_EXPS_PANEL].top + 1; uint height = this->widget[CFW_EXPS_PANEL].bottom - this->widget[CFW_EXPS_PANEL].top + 1;
if (_expenses_list_types[type].GetHeight() != height) { if (_expenses_list_types[type].GetHeight() != height) {
this->SetDirty(); this->SetDirty();
ResizeWindowForWidget(this, CFW_EXPS_PANEL, 0, _expenses_list_types[type].GetHeight() - height); ResizeWindowForWidget(this, CFW_EXPS_PANEL, 0, _expenses_list_types[type].GetHeight() - height);