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

enforce max text width and remove wrong <br/>

Browse source
This commit is contained in:
Subhraman Sarkar 2024-08-27 09:13:48 +05:30 • committed by Celtic Minstrel
parent 8ab6d2458a
commit 5ec7bee190
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -582,7 +582,7 @@ config rich_label::get_parsed_text(const config& parsed_text)
} else if (tag.key == "text") {
DBG_GUI_RL << "text: text=" << ((line.size() > 20) ? line.substr(0,20) : line) << "...";
DBG_GUI_RL << "text: text=" << gui2::debug_truncate(line) << "...";
(*curr_item)["font_size"] = font::SIZE_NORMAL;
(*curr_item)["text"] = (*curr_item)["text"].str() + line;
@ -605,12 +605,14 @@ config rich_label::get_parsed_text(const config& parsed_text)
(*curr_item)["actions"] = "([set_var('pos_x', 0), set_var('ww', 0), set_var('pos_y', pos_y + text_height + " + std::to_string(0.3*font::get_max_height(font::SIZE_NORMAL)) + ")])";
// Height update
int ah = get_text_size(*curr_item, w_ - float_size.x).y; // no x_?
int ah = get_text_size(*curr_item, w_ - float_size.x).y;
if (tmp_h > ah) {
tmp_h = 0;
}
txt_height_ += ah - tmp_h;
prev_blk_height_ += txt_height_ + 0.3*font::get_max_height(font::SIZE_NORMAL);
DBG_GUI_RL << "wrap: " << prev_blk_height_ << "," << txt_height_;
txt_height_ = 0;
@ -625,6 +627,7 @@ config rich_label::get_parsed_text(const config& parsed_text)
add_text_with_attribute(*curr_item, *removed_part);
} else if ((float_size.y > 0) && (text_size.y < float_size.y)) {
//TODO padding?
// text height less than floating image's height, don't split
DBG_GUI_RL << "no wrap";
(*curr_item)["actions"] = "([set_var('pos_y', pos_y + text_height)])";
@ -701,6 +704,7 @@ void rich_label::default_text_config(config* txt_ptr, t_string text) {
(*txt_ptr)["h"] = "(text_height)";
// tw -> table width, used for wrapping text inside table cols
// ww -> wrap width, used for wrapping around floating image
// max text width shouldn't go beyond the rich_label's specified width
(*txt_ptr)["maximum_width"] = "(width - pos_x - ww - tw)";
(*txt_ptr)["actions"] = "([set_var('pos_y', pos_y + text_height)])";
}
@ -713,6 +717,7 @@ void rich_label::update_canvas()
tmp.set_variable("pos_y", wfl::variant(0));
tmp.set_variable("img_x", wfl::variant(0));
tmp.set_variable("img_y", wfl::variant(0));
tmp.set_variable("width", wfl::variant(w_));
tmp.set_variable("tw", wfl::variant(0));
tmp.set_variable("ww", wfl::variant(0));
tmp.set_variable("padding", wfl::variant(padding_));

4
src/help/help_topic_generators.cpp
View file

@ -612,7 +612,7 @@ std::string unit_topic_generator::operator()() const {
ss << "\n" << detailed_description;
if(const auto notes = type_.special_notes(); !notes.empty()) {
ss << "<br/><header>" << _("Special Notes") << "</header>\n";
ss << "\n<header>" << _("Special Notes") << "</header>\n";
for(const auto& note : notes) {
ss << font::unicode_bullet << " <i>" << note << "</i>" << '\n';
}
@ -729,7 +729,7 @@ std::string unit_topic_generator::operator()() const {
ss << "<img src='" << type_icon << "'/>";
ss << lang_type << "<jump/>";
std::stringstream str;
str << "<format>color=\"" << color << "\" text='"<< resist << "'</format>";
str << "<span color='" << color << "' text='"<< resist << "'/>";
ss << str.str() << "<br/>";
}