void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix view refresh for album part messages.

Browse source 
Fixes #8974.
This commit is contained in:
John Preston 2020-11-05 17:50:58 +03:00
parent 3fdd6848c5
commit 039cad21a5
2 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Telegram/SourceFiles/history/history_inner_widget.cpp
View file

@ -289,45 +289,6 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
// Binary search should've skipped all the items that are above / below the visible area. // Binary search should've skipped all the items that are above / below the visible area.
if (TopToBottom) { if (TopToBottom) {
if (itembottom <= _visibleAreaTop) {
QStringList debug;
for (const auto &logBlock : history->blocks) {
QStringList debugItems;
for (const auto &logItem : logBlock->messages) {
debugItems.push_back(QString("%1,%2"
).arg(logItem->y()
).arg(logItem->height()
));
}
debug.push_back(QString("b(%1,%2:%3)"
).arg(logBlock->y()
).arg(logBlock->height()
).arg(debugItems.join(';')
));
}
CrashReports::SetAnnotation(
"geometry",
QString("height:%1 "
).arg(history->height()
) + debug.join(';'));
CrashReports::SetAnnotation(
"info",
QString("block:%1(%2,%3), "
"item:%4(%5,%6), "
"limits:%7,%8, "
"has:%9"
).arg(blockIndex
).arg(block->y()
).arg(block->height()
).arg(itemIndex
).arg(view->y()
).arg(view->height()
).arg(_visibleAreaTop
).arg(_visibleAreaBottom
).arg(Logs::b(history->hasPendingResizedItems())
));
Unexpected("itembottom > _visibleAreaTop");
}
Assert(itembottom > _visibleAreaTop); Assert(itembottom > _visibleAreaTop);
} else { } else {
Assert(itemtop < _visibleAreaBottom); Assert(itemtop < _visibleAreaBottom);
@ -415,8 +376,7 @@ void HistoryInner::enumerateUserpics(Method method) {
auto userpicCallback = [&](not_null<Element*> view, int itemtop, int itembottom) { auto userpicCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
// Skip all service messages. // Skip all service messages.
const auto item = view->data(); const auto item = view->data();
const auto message = item->toHistoryMessage(); if (view->isHidden() || !item->toHistoryMessage()) return true;
if (!message) return true;
if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) { if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) {
lowestAttachedItemTop = itemtop + view->marginTop(); lowestAttachedItemTop = itemtop + view->marginTop();

2
Telegram/SourceFiles/history/view/history_view_element.cpp
View file

@ -493,6 +493,8 @@ void Element::recountAttachToPreviousInBlocks() {
if (isHidden() || data()->isEmpty()) { if (isHidden() || data()->isEmpty()) {
if (const auto next = nextDisplayedInBlocks()) { if (const auto next = nextDisplayedInBlocks()) {
next->recountAttachToPreviousInBlocks(); next->recountAttachToPreviousInBlocks();
} else if (const auto previous = previousDisplayedInBlocks()) {
previous->setAttachToNext(false);
} }
return; return;
} }