From ca2692473d55a83cf82c2cfe7bf7377d6ed467f9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 2 Sep 2019 12:23:23 +0300 Subject: [PATCH] Fix inactive window notifications clearing. --- .../SourceFiles/history/history_widget.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index f6e15331f..07b964cad 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -2694,21 +2694,25 @@ void HistoryWidget::visibleAreaUpdated() { const auto scrollTop = _scroll->scrollTop(); const auto scrollBottom = scrollTop + _scroll->height(); _list->visibleAreaUpdated(scrollTop, scrollBottom); + controller()->floatPlayerAreaUpdated().notify(true); + const auto atBottom = (scrollTop >= _scroll->scrollTopMax()); - if (_history->loadedAtBottom() && (_history->unreadCount() > 0 || (_migrated && _migrated->unreadCount() > 0))) { + if (_history->loadedAtBottom() + && atBottom + && App::wnd()->doWeReadServerHistory()) { + // Clear possible scheduled messages notifications. + session().api().readServerHistory(_history); + session().notifications().clearFromHistory(_history); + } else if (_history->loadedAtBottom() + && (_history->unreadCount() > 0 + || (_migrated && _migrated->unreadCount() > 0))) { const auto unread = firstUnreadMessage(); const auto unreadVisible = unread && (scrollBottom > _list->itemTop(unread)); - if ((unreadVisible || atBottom) - && App::wnd()->doWeReadServerHistory()) { + if (unreadVisible && App::wnd()->doWeReadServerHistory()) { session().api().readServerHistory(_history); } } - if (_history->loadedAtBottom() && atBottom) { - // Clear possible scheduled messages notifications. - session().notifications().clearFromHistory(_history); - } - controller()->floatPlayerAreaUpdated().notify(true); } }