upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-14 11:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI2/Text Box Base: remove font_family_ member

Browse Source 
Added in 6c5a8e923d. We can just query the value directly from the resolution config.
This commit is contained in:
Charles Dang 2025-03-11 23:46:46 -04:00
parent 987004d09c
commit 5dd3ec6113
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widgets/multiline_text.cpp
View File

@ -249,7 +249,7 @@ void multiline_text::update_offsets()
const auto conf = cast_config_to<multiline_text_definition>();
assert(conf);
text_height_ = font::get_max_height(get_text_font_size(), get_font_family());
text_height_ = font::get_max_height(get_text_font_size(), conf->text_font_family);
wfl::map_formula_callable variables;
variables.add("height", wfl::variant(get_height()));

11
src/gui/widgets/text_box_base.hpp
View File

@ -307,15 +307,9 @@ protected:
return text_.get_column_line(position);
}
font::family_class get_font_family()
{
return font_family_;
}
void set_font_family(font::family_class fclass)
{
font_family_ = fclass;
text_.set_family_class(font_family_);
text_.set_family_class(fclass);
}
void set_font_size(const unsigned font_size)
@ -402,9 +396,6 @@ private:
/** The text entered in the widget. */
font::pango_text text_;
/** font family */
font::family_class font_family_;
/** Cached version of the text without any pending IME modifications. */
std::string text_cached_;