blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

segfault fix when trying to send something but the history isn't loaded yet, icon and for attached files which are not previewed

Browse Source
This commit is contained in:
Blue 2021-05-11 00:06:40 +03:00
parent ce047db787
commit b7b70bc198
3 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared/global.cpp
View File

@ -112,6 +112,8 @@ Shared::Global::Global():
#endif #endif
} }
static const QSize defaultIconFileInfoHeight(50, 50);
Shared::Global::FileInfo Shared::Global::getFileInfo(const QString& path) Shared::Global::FileInfo Shared::Global::getFileInfo(const QString& path)
{ {
std::map<QString, FileInfo>::const_iterator itr = instance->fileCache.find(path); std::map<QString, FileInfo>::const_iterator itr = instance->fileCache.find(path);
@ -131,6 +133,8 @@ Shared::Global::FileInfo Shared::Global::getFileInfo(const QString& path)
p = FileInfo::Preview::picture; p = FileInfo::Preview::picture;
QImage img(path); QImage img(path);
size = img.size(); size = img.size();
} else {
size = defaultIconFileInfoHeight;
} }
itr = instance->fileCache.insert(std::make_pair(path, FileInfo({info.fileName(), size, type, p}))).first; itr = instance->fileCache.insert(std::make_pair(path, FileInfo({info.fileName(), size, type, p}))).first;

7
ui/models/messagefeed.cpp
View File

@ -532,21 +532,24 @@ QModelIndex Models::MessageFeed::modelIndexById(const QString& id) const
QModelIndex Models::MessageFeed::modelIndexByTime(const QString& id, const QDateTime& time) const QModelIndex Models::MessageFeed::modelIndexByTime(const QString& id, const QDateTime& time) const
{ {
if (indexByTime.size() > 0) {
StorageByTime::const_iterator tItr = indexByTime.upper_bound(time); StorageByTime::const_iterator tItr = indexByTime.upper_bound(time);
StorageByTime::const_iterator tBeg = indexByTime.begin(); StorageByTime::const_iterator tBeg = indexByTime.begin();
StorageByTime::const_iterator tEnd = indexByTime.end();
bool found = false; bool found = false;
while (tItr != tBeg) { while (tItr != tBeg) {
if (id == (*tItr)->getId()) { if (tItr != tEnd && id == (*tItr)->getId()) {
found = true; found = true;
break; break;
} }
--tItr; --tItr;
} }
if (found || id == (*tItr)->getId()) { if (found && tItr != tEnd && id == (*tItr)->getId()) {
int position = indexByTime.rank(tItr); int position = indexByTime.rank(tItr);
return createIndex(position, 0, *tItr); return createIndex(position, 0, *tItr);
} }
}
return QModelIndex(); return QModelIndex();
} }

29
ui/utils/messagedelegate.cpp
View File

@ -307,7 +307,6 @@ void MessageDelegate::paintBar(QProgressBar* bar, QPainter* painter, bool sentBy
void MessageDelegate::paintPreview(const Models::FeedItem& data, QPainter* painter, QStyleOptionViewItem& option) const void MessageDelegate::paintPreview(const Models::FeedItem& data, QPainter* painter, QStyleOptionViewItem& option) const
{ {
Shared::Global::FileInfo info = Shared::Global::getFileInfo(data.attach.localPath); Shared::Global::FileInfo info = Shared::Global::getFileInfo(data.attach.localPath);
if (info.preview == Shared::Global::FileInfo::Preview::picture) {
QSize size = constrainAttachSize(info.size, option.rect.size()); QSize size = constrainAttachSize(info.size, option.rect.size());
QPoint start; QPoint start;
@ -317,16 +316,40 @@ void MessageDelegate::paintPreview(const Models::FeedItem& data, QPainter* paint
} else { } else {
start = option.rect.topLeft(); start = option.rect.topLeft();
} }
QRect rect(start, size);
switch (info.preview) {
case Shared::Global::FileInfo::Preview::picture: {
QImage img(data.attach.localPath); QImage img(data.attach.localPath);
if (img.isNull()) { if (img.isNull()) {
emit invalidPath(data.id); emit invalidPath(data.id);
} else { } else {
painter->drawImage(QRect(start, size), img); painter->drawImage(rect, img);
}
}
break;
default: {
QIcon icon = QIcon::fromTheme(info.mime.iconName());
painter->save();
painter->setFont(bodyFont);
int labelWidth = option.rect.width() - size.width() - margin;
QString elidedName = bodyMetrics.elidedText(info.name, Qt::ElideMiddle, labelWidth);
QSize nameSize = bodyMetrics.boundingRect(QRect(start, QSize(labelWidth, 0)), 0, elidedName).size();
if (data.sentByMe) {
start.rx() -= nameSize.width() + margin;
}
painter->drawPixmap({start, size}, icon.pixmap(info.size));
start.rx() += size.width() + margin;
start.ry() += nameSize.height() + (size.height() - nameSize.height()) / 2;
painter->drawText(start, elidedName);
painter->restore();
}
} }
option.rect.adjust(0, size.height() + textMargin, 0, 0); option.rect.adjust(0, size.height() + textMargin, 0, 0);
} }
}
QPushButton * MessageDelegate::getButton(const Models::FeedItem& data) const QPushButton * MessageDelegate::getButton(const Models::FeedItem& data) const
{ {