anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Apply message quote style prior to bold/italic style

Browse source 
Quotes apply to the whole line. Having a bold part in that line results in the quote styling only extending up to the bold part.
This commit is contained in:
fiaxh 2022-01-11 22:48:12 +01:00
parent fa6d49e3bf
commit 4e9e09a648
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main/src/ui/util/helper.vala
View file

@ -312,6 +312,18 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa
} }
if (parse_text_markup) { if (parse_text_markup) {
Regex quote_regex = new Regex("((?<=\n)&gt;.*(\n|$))|(^&gt;.*(\n|$))");
MatchInfo quote_match_info;
quote_regex.match(s.down(), 0, out quote_match_info);
if (quote_match_info.matches()) {
int start, end;
quote_match_info.fetch_pos(0, out start, out end);
return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
"<span fgalpha='70%'>" + s[start:end] + "</span>" +
parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
}
string[] markup_string = new string[]{"`", "_", "*", "~"}; string[] markup_string = new string[]{"`", "_", "*", "~"};
string[] convenience_tag = new string[]{"tt", "i", "b", "s"}; string[] convenience_tag = new string[]{"tt", "i", "b", "s"};
@ -334,19 +346,6 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa
assert_not_reached(); assert_not_reached();
} }
} }
Regex regex = new Regex("((?<=\n)&gt;.*(\n|$))|(^&gt;.*(\n|$))");
MatchInfo match_info;
regex.match(s.down(), 0, out match_info);
if (match_info.matches()) {
int start, end;
match_info.fetch_pos(0, out start, out end);
return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
"<span fgalpha='70%'>" + s[start:end] + "</span>" +
parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
}
} }
return s; return s;