upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 08:50:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly initialize units dialog in editor

Browse Source
This commit is contained in:
Subhraman Sarkar 2025-01-10 08:07:54 +05:30
parent abb90d309f
commit ebac8bd6da
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/editor/controller/editor_controller.cpp
View File

@ -1353,11 +1353,10 @@ void editor_controller::unit_list()
unit_list.push_back(i.get_shared_ptr());
}
gui2::dialogs::units_dialog unit_dlg;
unit_dlg.build_unit_list_dialog(unit_list);
const auto& unit_dlg = gui2::dialogs::units_dialog::build_unit_list_dialog(unit_list);
if (unit_dlg.show() && unit_dlg.is_selected()) {
const map_location& loc = unit_list[unit_dlg.get_selected_index()]->get_location();
if (unit_dlg->show() && unit_dlg->is_selected()) {
const map_location& loc = unit_list[unit_dlg->get_selected_index()]->get_location();
gui().scroll_to_tile(loc, display::WARP);
gui().select_hex(loc);
}

9
src/gui/dialogs/editor/edit_unit.cpp
View File

@ -20,7 +20,6 @@
#include "gui/dialogs/editor/edit_unit.hpp"
#include "filesystem.hpp"
#include "formula/string_utils.hpp"
#include "gettext.hpp"
#include "gui/dialogs/file_dialog.hpp"
#include "gui/dialogs/message.hpp"
@ -30,7 +29,6 @@
#include "gui/widgets/combobox.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/menu_button.hpp"
#include "gui/widgets/multimenu_button.hpp"
#include "gui/widgets/scroll_label.hpp"
@ -352,14 +350,13 @@ void editor_edit_unit::select_file(const std::string& default_dir, const std::st
void editor_edit_unit::load_unit_type() {
const auto& all_type_list = unit_types.types_list();
units_dialog type_select;
type_select.build_create_dialog(all_type_list);
const auto& type_select = gui2::dialogs::units_dialog::build_create_dialog(all_type_list);
if (!type_select.show() && !type_select.is_selected()) {
if (!type_select->show() && !type_select->is_selected()) {
return;
}
const auto& type = all_type_list[type_select.get_selected_index()];
const auto& type = all_type_list[type_select->get_selected_index()];
tab_container& tabs = find_widget<tab_container>("tabs");
tabs.select_tab(0);