upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

rich_label: move attributes to ctor

Browse Source
This commit is contained in:
Subhraman Sarkar 2024-09-19 10:41:49 +05:30 committed by Celtic Minstrel
parent dc68d261ca
commit 069a0c659d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/widgets/rich_label.cpp
View File

@ -55,12 +55,12 @@ rich_label::rich_label(const implementation::builder_rich_label& builder)
: styled_widget(builder, type()) : styled_widget(builder, type())
, state_(ENABLED) , state_(ENABLED)
, can_wrap_(true) , can_wrap_(true)
, link_aware_(true) , link_aware_(builder.link_aware)
, link_color_(font::YELLOW_COLOR) , link_color_(font::YELLOW_COLOR)
, can_shrink_(true) , can_shrink_(true)
, text_alpha_(ALPHA_OPAQUE) , text_alpha_(ALPHA_OPAQUE)
, unparsed_text_() , unparsed_text_()
, w_(0) , w_(builder.width(get_screen_size_variables()))
, h_(0) , h_(0)
, padding_(4) , padding_(4)
{ {
@ -869,13 +869,8 @@ std::unique_ptr<widget> builder_rich_label::build() const
const auto conf = lbl->cast_config_to<rich_label_definition>(); const auto conf = lbl->cast_config_to<rich_label_definition>();
assert(conf); assert(conf);
const wfl::map_formula_callable& size = get_screen_size_variables();
const unsigned w = width(size);
lbl->set_text_alignment(text_alignment); lbl->set_text_alignment(text_alignment);
lbl->set_link_aware(link_aware);
lbl->set_link_color(conf->link_color); lbl->set_link_color(conf->link_color);
lbl->set_width(w);
lbl->set_label(lbl->get_label()); lbl->set_label(lbl->get_label());
DBG_GUI_G << "Window builder: placed rich_label '" << id << "' with definition '" DBG_GUI_G << "Window builder: placed rich_label '" << id << "' with definition '"