upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-15 07:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rich label: add valign and halign attributes to table

Browse Source 
specifically, `valign` is available for `<row>` while `halign` is for `<col>`.
This commit is contained in:
Subhraman Sarkar 2025-03-18 15:31:33 +05:30
parent 6d05fb1f8d
commit d68071b2c9
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include "wml_exception.hpp"
#include <boost/format.hpp>
#include <boost/multi_array.hpp>
#include <functional>
#include <numeric>
#include <string>
@ -354,14 +355,14 @@ std::pair<config, point> rich_label::get_parsed_text(
columns = child.mandatory_child("row").child_count("col");
}
columns = (columns == 0) ? 1 : columns;
unsigned init_cell_width;
int init_cell_width;
if (child["width"] == "fill") {
init_cell_width = init_width/columns;
} else {
init_cell_width = child["width"].to_int(init_width)/columns;
}
std::vector<unsigned> col_widths(columns, 0);
std::vector<unsigned> row_heights(rows, 0);
std::vector<int> col_widths(columns, 0);
std::vector<int> row_heights(rows, 0);
is_text = false;
new_text_block = true;
@ -380,6 +381,7 @@ std::pair<config, point> rich_label::get_parsed_text(
};
std::array<int, 2> row_paddings;
boost::multi_array<point, 2> cell_sizes(boost::extents[rows][columns]);
// optimal col width calculation
for(const config& row : child.child_range("row")) {
@ -399,20 +401,20 @@ std::pair<config, point> rich_label::get_parsed_text(
// order: left padding|right padding
std::array<int, 2> col_paddings = get_padding(col["padding"]);
unsigned cell_width = init_cell_width - col_paddings[0] - col_paddings[1];
int cell_width = init_cell_width - col_paddings[0] - col_paddings[1];
pos.x += col_paddings[0];
// attach data
auto links = links_;
const auto& [table_elem, size] = get_parsed_text(col_cfg, pos, init_cell_width);
cell_sizes[row_idx][col_idx] = get_parsed_text(col_cfg, pos, init_cell_width).second;
links_ = links;
// column post-processing
row_heights[row_idx] = std::max(row_heights[row_idx], static_cast<unsigned>(size.y));
row_heights[row_idx] = std::max(row_heights[row_idx], cell_sizes[row_idx][col_idx].y);
if (!child["width"].empty()) {
col_widths[col_idx] = cell_width;
}
col_widths[col_idx] = std::max(col_widths[col_idx], static_cast<unsigned>(size.x));
col_widths[col_idx] = std::max(col_widths[col_idx], cell_sizes[row_idx][col_idx].x);
if (child["width"].empty()) {
col_widths[col_idx] = std::min(col_widths[col_idx], cell_width);
}
@ -463,8 +465,22 @@ std::pair<config, point> rich_label::get_parsed_text(
std::array<int, 2> col_paddings = get_padding(col["padding"]);
pos.x += col_paddings[0];
// set position according to alignment keys
point text_pos(pos);
if (row["valign"] == "center" || row["valign"] == "middle") {
text_pos.y += (row_heights[row_idx] - cell_sizes[row_idx][col_idx].y)/2;
} else if (row["valign"] == "bottom") {
text_pos.y += row_heights[row_idx] - cell_sizes[row_idx][col_idx].y;
}
if (col["halign"] == "center" || col["halign"] == "middle") {
text_pos.x += (col_widths[col_idx] - cell_sizes[row_idx][col_idx].x)/2;
} else if (col["halign"] == "right") {
text_pos.x += col_widths[col_idx] - cell_sizes[row_idx][col_idx].x;
}
// attach data
auto [table_elem, size] = get_parsed_text(col_cfg, pos, col_widths[col_idx]);
auto [table_elem, size] = get_parsed_text(col_cfg, text_pos, col_widths[col_idx]);
text_dom.append(std::move(table_elem));
pos.x += col_widths[col_idx];
pos.x += col_paddings[1];

4
src/help/help_topic_generators.cpp
View File

@ -727,10 +727,10 @@ std::string unit_topic_generator::operator()() const {
}
attack_ss << markup::tag("col", specials_ss.str());
} else {
attack_ss << markup::tag("col", font::unicode_em_dash);
attack_ss << markup::tag("col", {{"halign", "center"}}, font::unicode_em_dash);
}
table_ss << markup::tag("row", attack_ss.str());
table_ss << markup::tag("row", {{"valign", "center"}}, attack_ss.str());
}
ss << markup::tag("table", table_ss.str());