void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-19 07:37:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Count attachments only on visible items.

Browse source
This commit is contained in:
John Preston 2020-09-16 14:28:35 +03:00
parent 6eedeb3852
commit a91c078fb1
6 changed files with 59 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Telegram/SourceFiles/history/history.cpp
View file

@ -3135,6 +3135,17 @@ auto History::findFirstNonEmpty() const -> Element* {
return nullptr;
}
auto History::findFirstDisplayed() const -> Element* {
for (const auto &block : blocks) {
for (const auto &element : block->messages) {
if (!element->data()->isEmpty() && !element->isHidden()) {
return element.get();
}
}
}
return nullptr;
}
auto History::findLastNonEmpty() const -> Element* {
for (const auto &block : ranges::view::reverse(blocks)) {
for (const auto &element : ranges::view::reverse(block->messages)) {
@ -3146,6 +3157,17 @@ auto History::findLastNonEmpty() const -> Element* {
return nullptr;
}
auto History::findLastDisplayed() const -> Element* {
for (const auto &block : ranges::view::reverse(blocks)) {
for (const auto &element : ranges::view::reverse(block->messages)) {
if (!element->data()->isEmpty() && !element->isHidden()) {
return element.get();
}
}
}
return nullptr;
}
bool History::nonEmptyCountMoreThan(int count) const {
Expects(count >= 0);

2
Telegram/SourceFiles/history/history.h
View file

@ -81,7 +81,9 @@ public:
bool isEmpty() const;
bool isDisplayedEmpty() const;
Element *findFirstNonEmpty() const;
Element *findFirstDisplayed() const;
Element *findLastNonEmpty() const;
Element *findLastDisplayed() const;
bool hasOrphanMediaGroupPart() const;
bool removeOrphanMediaGroupPart();
QVector<MsgId> collectMessagesFromUserToDelete(

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

@ -2432,14 +2432,14 @@ void HistoryInner::adjustCurrent(int32 y, History *history) const {
auto HistoryInner::prevItem(Element *view) -> Element* {
if (!view) {
return nullptr;
} else if (const auto result = view->previousInBlocks()) {
} else if (const auto result = view->previousDisplayedInBlocks()) {
return result;
} else if (view->data()->history() == _history
&& _migrated
&& _history->loadedAtTop()
&& !_migrated->isEmpty()
&& _migrated->loadedAtBottom()) {
return _migrated->blocks.back()->messages.back().get();
return _migrated->findLastDisplayed();
}
return nullptr;
}
@ -2447,13 +2447,13 @@ auto HistoryInner::prevItem(Element *view) -> Element* {
auto HistoryInner::nextItem(Element *view) -> Element* {
if (!view) {
return nullptr;
} else if (const auto result = view->nextInBlocks()) {
} else if (const auto result = view->nextDisplayedInBlocks()) {
return result;
} else if (view->data()->history() == _migrated
&& _migrated->loadedAtBottom()
&& _history->loadedAtTop()
&& !_history->isEmpty()) {
return _history->blocks.front()->messages.front().get();
return _history->findFirstDisplayed();
}
return nullptr;
}

7
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -5044,14 +5044,15 @@ bool HistoryWidget::replyToPreviousMessage() {
_replyToId);
if (const auto item = session().data().message(fullId)) {
if (const auto view = item->mainView()) {
if (const auto previousView = view->previousInBlocks()) {
if (const auto previousView = view->previousDisplayedInBlocks()) {
const auto previous = previousView->data();
Ui::showPeerHistoryAtItem(previous);
replyToMessage(previous);
return true;
}
}
} else if (const auto previous = _history->lastMessage()) {
} else if (const auto previousView = _history->findLastDisplayed()) {
const auto previous = previousView->data();
Ui::showPeerHistoryAtItem(previous);
replyToMessage(previous);
return true;
@ -5068,7 +5069,7 @@ bool HistoryWidget::replyToNextMessage() {
_replyToId);
if (const auto item = session().data().message(fullId)) {
if (const auto view = item->mainView()) {
if (const auto nextView = view->nextInBlocks()) {
if (const auto nextView = view->nextDisplayedInBlocks()) {
const auto next = nextView->data();
Ui::showPeerHistoryAtItem(next);
replyToMessage(next);

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

@ -485,8 +485,14 @@ bool Element::isInOneDayWithPrevious() const {
}
void Element::recountAttachToPreviousInBlocks() {
if (isHidden() || data()->isEmpty()) {
if (const auto next = nextDisplayedInBlocks()) {
next->recountAttachToPreviousInBlocks();
}
return;
}
auto attachToPrevious = false;
if (const auto previous = previousInBlocks()) {
if (const auto previous = previousDisplayedInBlocks()) {
attachToPrevious = computeIsAttachToPrevious(previous);
previous->setAttachToNext(attachToPrevious);
}
@ -496,11 +502,11 @@ void Element::recountAttachToPreviousInBlocks() {
void Element::recountDisplayDateInBlocks() {
setDisplayDate([&] {
const auto item = data();
if (item->isEmpty()) {
if (isHidden() || item->isEmpty()) {
return false;
}
if (const auto previous = previousInBlocks()) {
if (const auto previous = previousDisplayedInBlocks()) {
const auto prev = previous->data();
return prev->isEmpty()
|| (previous->dateTime().date() != dateTime().date());
@ -707,6 +713,14 @@ Element *Element::previousInBlocks() const {
return nullptr;
}
Element *Element::previousDisplayedInBlocks() const {
auto result = previousInBlocks();
while (result && (result->data()->isEmpty() || result->isHidden())) {
result = result->previousInBlocks();
}
return result;
}
Element *Element::nextInBlocks() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock + 1 < _block->messages.size()) {
@ -720,6 +734,14 @@ Element *Element::nextInBlocks() const {
return nullptr;
}
Element *Element::nextDisplayedInBlocks() const {
auto result = nextInBlocks();
while (result && (result->data()->isEmpty() || result->isHidden())) {
result = result->nextInBlocks();
}
return result;
}
void Element::drawInfo(
Painter &p,
int right,

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

@ -296,7 +296,9 @@ public:
void setIndexInBlock(int index);
int indexInBlock() const;
Element *previousInBlocks() const;
Element *previousDisplayedInBlocks() const;
Element *nextInBlocks() const;
Element *nextDisplayedInBlocks() const;
void previousInBlocksChanged();
void nextInBlocksRemoved();