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

unit_preview_pane: Move the icons to before the damage and strikes, as in the sidebar.

Browse source
This commit is contained in:
josteph 2019-03-03 16:42:31 +00:00 • committed by Charles Dang
parent 0db0b8dd31
commit 26a30fc341
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/gui/widget/unit_preview_pane.cfg
View file

@ -194,8 +194,8 @@
vertical_grow = false vertical_grow = false
horizontal_alignment = "left" horizontal_alignment = "left"
vertical_alignment = "top" vertical_alignment = "top"
border = "top,right" border = "top"
border_size = 3 border_size = 2
[image] [image]
definition = "default" definition = "default"
id = "image_range" id = "image_range"
@ -207,8 +207,8 @@
vertical_grow = false vertical_grow = false
horizontal_alignment = "left" horizontal_alignment = "left"
vertical_alignment = "top" vertical_alignment = "top"
border = "top,right" border = "top"
border_size = 3 border_size = 2
[image] [image]
definition = "default" definition = "default"
id = "image_type" id = "image_type"
@ -220,8 +220,8 @@
vertical_grow = false vertical_grow = false
horizontal_alignment = "left" horizontal_alignment = "left"
vertical_alignment = "top" vertical_alignment = "top"
border = "top,bottom" border = "left"
border_size = 1 border_size = 5
[label] [label]
wrap = true wrap = true
definition = "default_small" definition = "default_small"

18
src/gui/widgets/unit_preview_pane.cpp
View file

@ -224,16 +224,16 @@ void unit_preview_pane::print_attack_details(T attacks, tree_view_node& parent_n
const bool range_png_exists = ::image::locator(range_png).file_exists(); const bool range_png_exists = ::image::locator(range_png).file_exists();
const bool type_png_exists = ::image::locator(type_png).file_exists(); const bool type_png_exists = ::image::locator(type_png).file_exists();
auto& subsection = add_name_tree_node( const std::string label = (formatter()
header_node, << font::span_color(font::unit_type_color)
"item", << a.damage() << font::weapon_numbers_sep << a.num_attacks()
(formatter() << font::span_color(font::unit_type_color) << a.damage() << font::weapon_numbers_sep << a.num_attacks() << " " << a.name() << "</span>").str() << " " << a.name() << "</span>").str();
); auto& subsection = header_node.add_child(
"item_image",
subsection.add_child("item_image",
{ {
{ "image_range", { { "label", range_png }, { "use_markup", "true" } } }, { "image_range", { { "label", range_png } } },
{ "image_type", { { "label", type_png }, { "use_markup", "true" } } }, { "image_type", { { "label", type_png } } },
{ "name", { { "label", label }, { "use_markup", "true" } } },
} }
); );