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

gui2/tunit_attack: Remove trailing newline from attack list entries

Browse source 
They mess with the text's alignment (vertically) on platforms where
trailing newlines in Pango contexts aren't broken.
This commit is contained in:
Ignacio R. Morelle 2016-03-06 04:50:03 -03:00
parent 1dedd10bd6
commit f24db0ae51
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -1,6 +1,9 @@
Version 1.13.3+dev:
* Language and i18n:
* Updated translations:
* User interface:
* Fix vertical alignment of individual attacks listed in the Attack Unit
dialog.
* Miscellaneous and bug fixes:
* Fix non-deterministic crashes in the Attack Unit dialog resulting from
invalid memory references (regression introduced in 1.13.3).

4
src/gui/dialogs/unit_attack.cpp
View file

@ -218,12 +218,12 @@ static void set_weapon_info(twindow& window,
attacker_stats << "<b>" << attw_name << "</b>" << "\n"
<< attacker.damage << font::weapon_numbers_sep << attacker_weapon.num_attacks()
<< attw_apecials << "\n"
<< font::span_color(a_cth_color) << attacker.chance_to_hit << "%</span>" << "\n";
<< font::span_color(a_cth_color) << attacker.chance_to_hit << "%</span>";
defender_stats << "<b>" << defw_name << "</b>" << "\n"
<< defender.damage << font::weapon_numbers_sep << defender_weapon.num_attacks()
<< defw_specials << "\n"
<< font::span_color(d_cth_color) << defender.chance_to_hit << "%</span>" << "\n";
<< font::span_color(d_cth_color) << defender.chance_to_hit << "%</span>";
std::map<std::string, string_map> data;
string_map item;