Skip to content

Commit

Permalink
Minor cleanup of #4676
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Jan 24, 2020
1 parent 785878c commit 1189a22
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
16 changes: 5 additions & 11 deletions src/gui/widgets/unit_preview_pane.cpp
Expand Up @@ -77,7 +77,7 @@ void unit_preview_pane::finalize_setup()

// Labels
label_name_ = find_widget<label>(this, "type_name", false, false);
label_level_ = find_widget<styled_widget>(this, "type_level", 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_minimal", false, false);

Expand Down Expand Up @@ -292,11 +292,8 @@ void unit_preview_pane::set_displayed_type(const unit_type& type)
if(label_level_) {
std::string l_str = VGETTEXT("Lvl $lvl", {{"lvl", std::to_string(type.level())}});

label_level_->set_members({
{ "label", "<b>" + l_str + "</b>" },
{ "tooltip", unit_helper::unit_level_tooltip(type) }
});

label_level_->set_label("<b>" + l_str + "</b>");
label_level_->set_tooltip(unit_helper::unit_level_tooltip(type));
label_level_->set_use_markup(true);
}

Expand Down Expand Up @@ -447,11 +444,8 @@ void unit_preview_pane::set_displayed_unit(const unit& u)
if(label_level_) {
std::string l_str = VGETTEXT("Lvl $lvl", {{"lvl", std::to_string(u.level())}});

label_level_->set_members({
{ "label", "<b>" + l_str + "</b>" },
{ "tooltip", unit_helper::unit_level_tooltip(u) }
});

label_level_->set_label("<b>" + l_str + "</b>");
label_level_->set_tooltip(unit_helper::unit_level_tooltip(u));
label_level_->set_use_markup(true);
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/unit_preview_pane.hpp
Expand Up @@ -81,7 +81,7 @@ class unit_preview_pane : public container_base
image* icon_alignment_;

label* label_name_;
styled_widget* label_level_;
label* label_level_;
label* label_race_;

styled_widget* label_details_;
Expand Down

0 comments on commit 1189a22

Please sign in to comment.