0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced hyphen-minus with the Unicode minus in the in-game income element.

Browse source
This commit is contained in:
Steven Panek 2011-10-02 17:45:39 +00:00
parent de85cccd79
commit 8e92598e1c
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/themes/default.cfg
View file

@ -198,7 +198,7 @@
[panel]
id=income-panel
image=themes/status-bg.png
rect="+5,=,+80,="
rect="+5,=,+85,="
xanchor=fixed
yanchor=fixed
[/panel]
@ -344,7 +344,7 @@
id=status-income
font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+40,+16"
rect="+4,=,+60,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -631,7 +631,7 @@
[/change]
[change]
id=status-income
rect="+4,=,+30,+16"
rect="+4,=,+50,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]

6
data/themes/widescreen.cfg
View file

@ -232,7 +232,7 @@
[panel]
id=income-panel
image=themes/status-bg.png
rect="+5,=,+80,="
rect="+5,=,+85,="
xanchor=fixed
yanchor=fixed
[/panel]
@ -407,7 +407,7 @@
id=status-income
font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+40,+16"
rect="+4,=,+60,+16"
xanchor=fixed
yanchor=fixed
prefix="" #wmllint: ignore
@ -860,7 +860,7 @@
[/change]
[change]
id=status-income
rect="+4,=,+30,+16"
rect="+4,=,+50,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]

11
src/reports.cpp
View file

@ -1056,12 +1056,17 @@ REPORT_GENERATOR(income)
const team &viewing_team = (*resources::teams)[viewing_side - 1];
team_data td = calculate_team_data(viewing_team, viewing_side);
char const *end = naps;
if (viewing_side != resources::screen->playing_side())
if (viewing_side != resources::screen->playing_side()) {
str << span_color(font::GRAY_COLOR);
else if (td.net_income < 0)
}
else if (td.net_income < 0) {
td.net_income = - td.net_income;
str << span_color(font::BAD_COLOR);
else
str << utils::unicode_minus;
}
else {
end = "";
}
str << td.net_income << end;
return text_report(str.str());
}