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

GUI2/Faction Select: use an drawing widget for the leader display

Browse source
This commit is contained in:
Charles Dang 2021-08-09 00:58:08 -04:00
parent 6d13209a64
commit ca77f7e3e8
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
data/gui/window/mp_faction_select.cfg
View file

@ -93,12 +93,23 @@
[column]
{GUI_FORCE_WIDGET_MINIMUM_SIZE 144 144 (
[image]
definition = "centered"
id = "leader_image"
[/image]
)}
[drawing]
id = "leader_image"
definition = "default"
width = 144
height = 144
[draw]
[image]
name = "(text)"
w = "(width)"
h = "(height)"
resize_mode = "scale_sharp"
[/image]
[/draw]
[/drawing]
[/column]

18
src/gui/dialogs/multiplayer/faction_select.cpp
View file

@ -16,21 +16,21 @@
#include "gui/dialogs/multiplayer/faction_select.hpp"
#include "formatter.hpp"
#include "game_config_manager.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/core/log.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/drawing.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/menu_button.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/window.hpp"
#include "formatter.hpp"
#include "gettext.hpp"
#include "help/help.hpp"
#include "preferences/game.hpp" // for encountered_units
#include "preferences/game.hpp" // for encountered_units
#include "units/types.hpp"
#include <functional>
@ -211,10 +211,10 @@ void faction_select::update_leader_image()
if(const unit_type* ut = unit_types.find(flg_manager_.current_leader())) {
const unit_type& utg = ut->get_gender_unit_type(flg_manager_.current_gender());
leader_image = formatter() << utg.image() << "~RC(" << utg.flag_rgb() << ">" << tc_color_ << ")" << "~SCALE_INTO_SHARP(144,144)";
leader_image = formatter() << utg.image() << "~RC(" << utg.flag_rgb() << ">" << tc_color_ << ")";
}
find_widget<image>(get_window(), "leader_image", false).set_label(leader_image);
find_widget<drawing>(get_window(), "leader_image", false).set_label(leader_image);
}
void faction_select::post_show(window& /*window*/)