Merge branch 'master' of ssh://dev.net-p.org:2020/tamra/saori
commit bde43db02d437036d7a35b18eca74f6806cfb85d
2 parents feb21d5 + 8cd7521
@TAM (Teppei Tamra) TAM (Teppei Tamra) authored on 8 Jun 2018
Showing 1 changed file
View
7
saoriviewentry.cpp
}
m_urlmap[i] = imageurl;
if (m_imagecache_g.contains(i)) {
document()->addResource(QTextDocument::ImageResource,QUrl("img:" + imageurl),QVariant(m_imagecache_g[i]));
auto c = m_imagecache_g.take(i);
m_imagecache_g[i] = c;
} else if (m_imagecache_l.contains(i)) {
document()->addResource(QTextDocument::ImageResource,QUrl("img:" + imageurl),QVariant(m_imagecache_l[i]));
} else {
QImage img(imageurl);
imageResizer(i.left(p),img);
document()->addResource(QTextDocument::ImageResource,QUrl("img:" + imageurl),QVariant(img));
auto type = i.split(':')[0];
if (((type == "icon") || (type == "avatar") || (type == "mavatar")) && (imageurl.left(2) != ":/"))
if (((type == "icon") || (type == "avatar") || (type == "mavatar")) && (imageurl.left(2) != ":/")) {
if (m_imagecache_g.count() >= 500) m_imagecache_g.take(m_imagecache_g.firstKey());
m_imagecache_g[i] = img;
}
else if (imageurl != SAORI_ICONS_LOADING) m_imagecache_l[i] = img;
}
}
setText(designedText(cw));