Campaign Difficulty: rearranged entry layout

(cherry-picked from commit 67530c4375)
This commit is contained in:
Charles Dang 2018-05-25 11:45:24 +11:00
parent a0eb92e669
commit 886156b0fe
3 changed files with 36 additions and 29 deletions

View file

@ -107,6 +107,7 @@
* Added a button to access the version info dialog to Preferences.
* Removed player list sorting options in the MP lobby. The list is now
automatically sorted alphabetically, friends first.
* Rearranged campaign difficulty menu layout
### WML engine
* Support formula= key in [variable] ConditionalWML
* Support to_location in [move_unit], taking a location ID

View file

@ -27,16 +27,6 @@
fixed_width = true
[/linked_group]
[linked_group]
id = "label"
fixed_width = true
[/linked_group]
[linked_group]
id = "description"
fixed_width = true
[/linked_group]
[tooltip]
id = "tooltip"
[/tooltip]
@ -181,28 +171,44 @@
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[label]
id = "label"
definition = "default"
linked_group = "label"
[/label]
[grid]
[/column]
[row]
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
[label]
id = "description"
definition = "default"
linked_group = "description"
[/label]
[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]
[/column]

View file

@ -140,7 +140,7 @@ void campaign_difficulty::pre_show(window& window)
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();
: (formatter() << font::span_color(font::GRAY_COLOR) << d["description"].str() << "</span>").str();
item["label"] = descrip_text;
data.emplace("description", item);