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

Campaign Difficulty: consolidated both lines into a single label

Browse source 
(cherry-picked from commit f72f89f4d5)
This commit is contained in:
Charles Dang 2018-05-29 20:55:34 +11:00
parent fbdc6814e0
commit 075d793539
2 changed files with 18 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
data/gui/window/campaign_difficulty.cfg
View file

@ -171,44 +171,13 @@
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[grid]
[row]
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[label]
id = "label"
definition = "default_large"
[/label]
[/column]
[/row]
[row]
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[label]
id = "description"
definition = "default"
[/label]
[/column]
[/row]
[/grid]
[label]
id = "label"
definition = "default_large"
[/label]
[/column]

20
src/gui/dialogs/campaign_difficulty.cpp
View file

@ -135,16 +135,20 @@ void campaign_difficulty::pre_show(window& window)
item["use_markup"] = "true";
item["label"] = d["label"];
std::ostringstream ss;
ss << d["label"];
if(!d["description"].empty()) {
if (!d["old_markup"].to_bool()) {
ss << "\n<small>" << font::span_color(font::GRAY_COLOR) << "(" << d["description"].str() << ")</span></small>"";
} else {
ss << "\n<small>" << d["description"] << "</small>";
}
}
item["label"] = ss.str();
data.emplace("label", item);
const std::string descrip_text = d["old_markup"].to_bool() || d["description"].empty()
? d["description"]
: (formatter() << font::span_color(font::GRAY_COLOR) << "(" << d["description"].str() << ")</span>").str();
item["label"] = descrip_text;
data.emplace("description", item);
grid& grid = list.add_row(data);
if(d["default"].to_bool(false)) {