Campaign Difficulty: rearranged entry layout

wesnoth · May 25, 2018 · 67530c4 · 67530c4
1 parent b24de54
commit 67530c4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 29 deletions.
diff --git a/changelog.md b/changelog.md
@@ -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

diff --git a/data/gui/window/campaign_difficulty.cfg b/data/gui/window/campaign_difficulty.cfg
@@ -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]
 

diff --git a/src/gui/dialogs/campaign_difficulty.cpp b/src/gui/dialogs/campaign_difficulty.cpp
@@ -107,7 +107,7 @@ void campaign_difficulty::pre_show(window& window)
 
 		if(!d["description"].empty()) {
 			item["label"] = (formatter() <<
-				font::span_color(font::GRAY_COLOR) << "(" << d["description"].str() << ")" << "</span>").str();
+				font::span_color(font::GRAY_COLOR) << d["description"].str() << "</span>").str();
 			data.emplace("description", item);
 		}