diff --git a/app_win_2_back.cpp b/app_win_2_back.cpp index b51ea15..cc65a5d 100644 --- a/app_win_2_back.cpp +++ b/app_win_2_back.cpp @@ -206,10 +206,6 @@ namespace gui_to_app { app_builder }; - damage_label = app_builder->get_widget("label_degat"); - armor_label = app_builder->get_widget("label_armure"); - critic_label = app_builder->get_widget("label_critique"); - debug_button->signal_clicked().connect(sigc::mem_fun(*this, &AppWin2Back::debug_button_clicked), false); } @@ -229,7 +225,7 @@ namespace gui_to_app { static void convert_to_label(std::array &convert, const std::string_view &err_msg, - const std::int32_t data, + const uint32_t data, Gtk::Label *const __restrict label) noexcept { if (const auto [ptr, ec] = std::to_chars(convert.data(), convert.data() + convert.size(), data); ec != std::errc()) { @@ -248,13 +244,10 @@ namespace gui_to_app { const std::string_view short_name, const CaracInterface &labels) noexcept { std::array convert{}; - convert_to_label(convert, - std::format("base {}", short_name), - static_cast(charac.get_base()), - labels.base); + convert_to_label(convert, std::format("base {}", short_name), charac.get_base(), labels.base); convert_to_label(convert, std::format("carac {}", short_name), - static_cast(charac.get_carac()), + charac.get_carac(), labels.carac); convert_to_label(convert, std::format("materiel {}", short_name), @@ -271,11 +264,6 @@ namespace gui_to_app { update_in_labels(sheet.get_endurance(), "endu", endu_labels); update_in_labels(sheet.get_adresse(), "adresse", addr_labels); update_in_labels(sheet.get_chance(), "chance", luck_labels); - - std::array convert{ '\0' }; - convert_to_label(convert, "damage", static_cast(sheet.get_damage()), damage_label); - convert_to_label(convert, "armor", static_cast(sheet.get_armor()), armor_label); - convert_to_label(convert, "critic", static_cast(sheet.get_critique()), critic_label); } bool AppWin2Back::insert_obj(const character::billyEnums &obj) noexcept { diff --git a/app_win_2_back.hpp b/app_win_2_back.hpp index 2865b72..0475a9d 100644 --- a/app_win_2_back.hpp +++ b/app_win_2_back.hpp @@ -108,10 +108,6 @@ namespace gui_to_app { CaracInterface luck_labels; - Gtk::Label *damage_label{ nullptr }; - Gtk::Label *armor_label{ nullptr }; - Gtk::Label *critic_label{ nullptr }; - Gtk::Button *debug_button{ nullptr }; std::array signal_handlers{ diff --git a/window_ui.ui b/window_ui.ui index b0627e8..a9d7e38 100644 --- a/window_ui.ui +++ b/window_ui.ui @@ -536,7 +536,6 @@ - True start @@ -550,8 +549,7 @@ - center - True + end 1 0 @@ -570,7 +568,7 @@ - center + end 1 1 @@ -589,7 +587,7 @@ - center + end 1 2 @@ -613,8 +611,6 @@ - center - True 2 0 @@ -658,8 +654,7 @@ - center - True + end 1 0 @@ -678,7 +673,7 @@ - center + end 1 1 @@ -697,7 +692,7 @@ - center + end 1 2 @@ -721,8 +716,6 @@ - center - True 2 0