rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make custom emoticons twice as high as the font.

This commit is contained in:
tastytea 2021-12-27 23:16:26 +01:00
parent 5ac1195402
commit 850d139e3d
No known key found for this signature in database
GPG Key ID: CFC39497F1B26E07
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/timeline/TimelineModel.cpp
View File

@ -561,25 +561,28 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
} }
// TODO(Nico): Don't parse html with a regex // TODO(Nico): Don't parse html with a regex
const static QRegularExpression matchEmoticonHeight(
"(<img data-mx-emoticon [^>]*)height=\"([^\"]*)\"([^>]*>)");
formattedBody_.replace(matchEmoticonHeight, QString("\\1 height=\"%1\"\\3").arg(ascent));
const static QRegularExpression matchIsImg("<img [^>]+>"); const static QRegularExpression matchIsImg("<img [^>]+>");
auto itIsImg = matchIsImg.globalMatch(formattedBody_); auto itIsImg = matchIsImg.globalMatch(formattedBody_);
while (itIsImg.hasNext()) { while (itIsImg.hasNext()) {
// The current <img> tag.
const QString curImg = itIsImg.next().captured(0); const QString curImg = itIsImg.next().captured(0);
// The replacement for the current <img>.
auto imgReplacement = curImg;
// Construct image parameters later used by MxcImageProvider. // Construct image parameters later used by MxcImageProvider.
QString imgParams; QString imgParams;
if (curImg.contains("height")) { if (curImg.contains("height")) {
const static QRegularExpression matchImgHeight("height=[\"\']?(\\d+)[\"\']?"); const static QRegularExpression matchImgHeight("height=([\"\']?)(\\d+)([\"\']?)");
const auto height = matchImgHeight.match(curImg).captured(1).toInt(); // Make emoticons twice as high as the font.
if (curImg.contains("data-mx-emoticon")) {
imgReplacement =
imgReplacement.replace(matchImgHeight, "height=\\1%1\\3").arg(ascent * 2);
}
const auto height = matchImgHeight.match(imgReplacement).captured(2).toInt();
imgParams = QString("?scale&height=%1").arg(height); imgParams = QString("?scale&height=%1").arg(height);
} }
// Replace src in current <img>. // Replace src in current <img>.
auto imgReplacement = curImg;
const static QRegularExpression matchImgUri("src=\"mxc://([^\"]*)\""); const static QRegularExpression matchImgUri("src=\"mxc://([^\"]*)\"");
imgReplacement.replace(matchImgUri, imgReplacement.replace(matchImgUri,
QString("src=\"image://mxcImage/\\1%1\"").arg(imgParams)); QString("src=\"image://mxcImage/\\1%1\"").arg(imgParams));