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

Unit Preview Pane: Remove a relic of an older implementation

Browse source
This commit is contained in:
Celtic Minstrel 2017-05-14 09:41:30 -04:00
parent b572928e26
commit 72b98ad7e1
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/gui/widget/unit_preview_pane.cfg
View file

@ -133,7 +133,7 @@
# TODO: remove this if default_width is sufficient
#{GUI_FORCE_WIDGET_MINIMUM_SIZE 225 0 (
[tree_view]
id = "tree_details"
id = "type_details"
indentation_step_size = 8
vertical_scrollbar_mode = "auto"

11
src/gui/widgets/unit_preview_pane.cpp
View file

@ -73,10 +73,9 @@ void unit_preview_pane::finalize_setup()
label_name_ = find_widget<label>(this, "type_name", false, false);
label_level_ = find_widget<label>(this, "type_level", false, false);
label_race_ = find_widget<label>(this, "type_race_label", false, false);
label_details_ = find_widget<styled_widget>(this, "type_details", false, false);
label_details_minimal_ = find_widget<styled_widget>(this, "type_details_minimal", false, false);
label_details_ = find_widget<styled_widget>(this, "type_details_minimal", false, false);
tree_details_ = find_widget<tree_view>(this, "tree_details", false, false);
tree_details_ = find_widget<tree_view>(this, "type_details", false, false);
// Profile button
button_profile_ = find_widget<button>(this, "type_profile", false, false);
@ -408,7 +407,7 @@ void unit_preview_pane::set_displayed_unit(const unit& u)
u.gender()));
}
if(label_details_minimal_) {
if(label_details_) {
std::stringstream str;
const std::string name = "<span size='large'>" + (!u.name().empty() ? u.name() : " ") + "</span>";
@ -428,8 +427,8 @@ void unit_preview_pane::set_displayed_unit(const unit& u)
str << font::span_color(u.xp_color())
<< _("XP: ") << u.experience() << "/" << u.max_experience() << "</span>";
label_details_minimal_->set_label(str.str());
label_details_minimal_->set_use_markup(true);
label_details_->set_label(str.str());
label_details_->set_use_markup(true);
}
if(tree_details_) {

2
src/gui/widgets/unit_preview_pane.hpp
View file

@ -51,7 +51,6 @@ public:
, label_level_(nullptr)
, label_race_(nullptr)
, label_details_(nullptr)
, label_details_minimal_(nullptr)
, tree_details_(nullptr)
, button_profile_(nullptr)
, image_mods_()
@ -99,7 +98,6 @@ private:
label* label_race_;
styled_widget* label_details_;
styled_widget* label_details_minimal_;
tree_view* tree_details_;
button* button_profile_;