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

MP/Staging, Join Game: fixed some alignment and formatting issues

Browse source
This commit is contained in:
Charles Dang 2024-08-11 17:00:21 -04:00
parent 71f9ee6ae7
commit 44db56d767
4 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
data/gui/themes/default/window/mp_join_game.cfg
View file

@ -151,9 +151,8 @@
border_size = 5
[label]
definition = "default_small"
label = _ "<b>Faction:</b>"
use_markup = true
definition = "gold_small"
label = _ "Faction:"
[/label]
[/column]
@ -163,18 +162,29 @@
border = "left,bottom,right"
border_size = 5
horizontal_grow = true
vertical_grow = true
[label]
id = "leader_faction"
definition = "default_small"
use_markup = true
[/label]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_grow = true
[grid]
[row]
[column]
@ -183,9 +193,8 @@
border_size = 5
[label]
definition = "default_small"
label = _ "<b>Gender:</b>"
use_markup = true
definition = "gold_small"
label = _ "Gender:"
[/label]
[/column]
@ -195,11 +204,10 @@
border = "left,bottom,right"
border_size = 5
horizontal_alignment = "left"
vertical_grow = true
[image]
id = "leader_gender"
definition = "default_small"
definition = "default"
[/image]
[/column]

22
data/gui/themes/default/window/mp_staging.cfg
View file

@ -153,7 +153,7 @@
border_size = 5
[label]
definition = "default_small"
definition = "gold_small"
label = _ "Faction:"
[/label]
@ -164,12 +164,10 @@
border = "left,bottom,right"
border_size = 5
horizontal_grow = true
vertical_grow = true
[label]
id = "leader_faction"
definition = "default_small"
use_markup = true
use_tooltip_on_label_overflow = true
[/label]
@ -177,6 +175,19 @@
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
horizontal_grow = true
[grid]
[row]
[column]
@ -185,7 +196,7 @@
border_size = 5
[label]
definition = "default_small"
definition = "gold_small"
label = _ "Gender:"
[/label]
@ -196,11 +207,10 @@
border = "left,bottom,right"
border_size = 5
horizontal_alignment = "left"
vertical_grow = true
[image]
id = "leader_gender"
definition = "default_small"
definition = "default"
[/image]
[/column]

2
src/gui/dialogs/multiplayer/mp_join_game.cpp
View file

@ -413,7 +413,7 @@ void mp_join_game::generate_side_list()
item["label"] = description;
data.emplace("leader_type", item);
item["label"] = (formatter() << "<span color='#a69275'>" << side["faction_name"] << "</span>").str();
item["label"] = side["faction_name"];
data.emplace("leader_faction", item);
std::string gender_icon = "icons/icon-random.png";

4
src/gui/dialogs/multiplayer/mp_staging.cpp
View file

@ -463,8 +463,6 @@ void mp_staging::on_side_slider_change(ng::side_engine_ptr side, slider& slider)
void mp_staging::update_leader_display(ng::side_engine_ptr side, grid& row_grid)
{
const std::string current_faction = side->flg().current_faction()["name"];
// BIG FAT TODO: get rid of this shitty "null" string value in the FLG manager
std::string current_leader = side->flg().current_leader() != "null" ? side->flg().current_leader() : font::unicode_em_dash;
const std::string current_gender = side->flg().current_gender() != "null" ? side->flg().current_gender() : font::unicode_em_dash;
@ -493,7 +491,7 @@ void mp_staging::update_leader_display(ng::side_engine_ptr side, grid& row_grid)
}
find_widget<label>(&row_grid, "leader_type", false).set_label(current_leader == "random" ? _("Random") : current_leader);
find_widget<label>(&row_grid, "leader_faction", false).set_label("<span color='#a69275'>" + current_faction + "</span>");
find_widget<label>(&row_grid, "leader_faction", false).set_label(side->flg().current_faction()["name"]);
// Gender
if(current_gender != font::unicode_em_dash) {