MP Staging/MP Join Game: always draw leader sprite at 72x72 (fixes #1981

) This is also related to #1932. I fixed leader sprites being cropped in 41e6741, and that made sprites in MP Staging always scale to 72x72. However, large sprites like the Fire Dragon's still drew at full size in MP Join Game since the damn tree nodes are being recreated when new changes come in (a separate issue I need to fix). This change fixes the size of leader sprites in both dialogs to 72x72 regardless of sprite size, so we're saved any similar issues cropping up in the future even once I do fix the excessive node recreation in MP Join Game.
wesnoth · Feb 6, 2018 · 01105cc · 01105cc · CelticMinstrel · Feb 7, 2018
1 parent ba22daf
commit 01105cc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/data/gui/window/mp_join_game.cfg b/data/gui/window/mp_join_game.cfg
@@ -76,11 +76,24 @@
 									border = "all"
 									border_size = 5
 
-									[image]
+									[drawing]
 										id = "leader_image"
-										definition = "scaled_to_size"
-										linked_group = "leader_images"
-									[/image]
+										definition = "default"
+
+										width = 72
+										height = 72
+
+										[draw]
+											[image]
+												name = "(text)"
+												w = "(min(image_original_width, 72))"
+												h = "(min(image_original_height, 72))"
+
+												{GUI_CENTERED_IMAGE}
+											[/image]
+										[/draw]
+
+									[/drawing]
 								[/column]
 
 								[column]

diff --git a/data/gui/window/mp_staging.cfg b/data/gui/window/mp_staging.cfg
@@ -88,11 +88,25 @@
 									border = "all"
 									border_size = 5
 
-									[image]
+									[drawing]
 										id = "leader_image"
-										definition = "scaled_to_size"
-										linked_group = "leader_images"
-									[/image]
+										definition = "default"
+
+										width = 72
+										height = 72
+
+										[draw]
+											[image]
+												name = "(text)"
+												w = "(min(image_original_width, 72))"
+												h = "(min(image_original_height, 72))"
+
+												{GUI_CENTERED_IMAGE}
+											[/image]
+										[/draw]
+
+									[/drawing]
+
 								[/column]
 
 								[column]

diff --git a/src/gui/dialogs/multiplayer/mp_staging.cpp b/src/gui/dialogs/multiplayer/mp_staging.cpp
@@ -24,6 +24,7 @@
 #include "gui/dialogs/multiplayer/faction_select.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/chatbox.hpp"
+#include "gui/widgets/drawing.hpp"
 #include "gui/widgets/menu_button.hpp"
 #include "gui/widgets/image.hpp"
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
@@ -423,7 +424,7 @@ void mp_staging::update_leader_display(ng::side_engine_ptr side, grid& row_grid)
 		current_leader = type.type_name();
 	}
 
-	find_widget<image>(&row_grid, "leader_image", false).set_label(new_image);
+	find_widget<drawing>(&row_grid, "leader_image", false).set_label(new_image);
 
 	// Faction and leader
 	if(!side->cfg()["name"].empty()) {