amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

add font picker, color picker and bullet point ui tools

Browse Source
This commit is contained in:
GenevensiS
2026-02-05 16:02:55 +01:00
parent 11e506739a
commit e9abd1fb77
31 changed files with 519 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/text/element.cpp
+19 -5
View File
@@ -172,12 +172,24 @@ private:
fromString(e->children, text, pos, end_tag);
elements.push_back(e);
pos = skip_tag(text, end_tag);
} else if (is_tag(text, tag_start, _("</bullet"))) {
// end of bullet point, set margin here
} else if (is_tag(text, tag_start, _("<bullet"))) {
// start of bullet point, set margin before bullet here, but only once
// subsequent times will align to this one
if (paragraphs.back().margin_before_bullet == paragraphs.back().start) {
paragraphs.back().margin_before_bullet = tag_start;
}
if (li <= 0) {
queue_message(MESSAGE_WARNING, _("<bullet> outside <li> tag"));
}
} else if (is_tag(text, tag_start, _("</bullet"))) {
// end of bullet point, set margin after bullet here, but only once
// subsequent times will align to this one
if (paragraphs.back().margin_after_bullet == paragraphs.back().start) {
paragraphs.back().margin_after_bullet = pos;
}
if (li <= 0) {
queue_message(MESSAGE_WARNING, _("<bullet> outside <li> tag"));
}
paragraphs.back().margin_end_char = pos;
} else if (is_tag(text, tag_start, _("<margin"))) {
size_t colon = text.find_first_of(_(">:"), tag_start);
if (colon < pos - 1 && text.GetChar(colon) == _(':')) {
@@ -282,7 +294,8 @@ private:
paragraphs.back().end = i + 1;
paragraphs.emplace_back();
paragraphs.back().start = i + 1;
paragraphs.back().margin_end_char = i + 1;
paragraphs.back().margin_before_bullet = i + 1;
paragraphs.back().margin_after_bullet = i + 1;
if (!margins.empty()) {
paragraphs.back().margin_left = margins.back().left;
paragraphs.back().margin_right = margins.back().right;
@@ -303,7 +316,8 @@ private:
(kwpph > 0 ? FONT_SOFT : FONT_NORMAL) |
(code > 0 ? FONT_CODE : FONT_NORMAL) |
(code_kw > 0 ? FONT_CODE_KW : FONT_NORMAL) |
(code_string > 0 ? FONT_CODE_STRING : FONT_NORMAL),
(code_string > 0 ? FONT_CODE_STRING : FONT_NORMAL) |
(!fonts.empty() ? FONT_FROM_TAG : FONT_NORMAL),
underline > 0,
strikethrough > 0,
fonts.empty() ? nullptr : &fonts.back(),