mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 15:45:12 +00:00
Code Issues Releases Wiki Activity

Don't scroll through from chats list to stories.

Browse Source
This commit is contained in:
John Preston
2023-06-27 19:40:45 +04:00
parent 7f583f86c0
commit c61e1b9139
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@@ -73,11 +73,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/qt/qt_common_adapters.h"
#include <QtCore/QMimeData>
#include <QtWidgets/QScrollBar>
namespace Dialogs {
namespace {
constexpr auto kSearchPerPage = 50;
constexpr auto kWaitTillAllowStoriesExpand = crl::time(200);
} // namespace
@@ -208,6 +210,9 @@ Widget::Widget(
, _cancelSearch(_searchControls, st::dialogsCancelSearch)
, _lockUnlock(_searchControls, st::dialogsLock)
, _scroll(this)
, _allowStoriesExpandTimer([=] {
_scroll->verticalScrollBar()->setMinimum(0);
})
, _scrollToTop(_scroll, st::dialogsToUp)
, _searchTimer([=] { searchMessages(); })
, _singleMessageSearch(&controller->session()) {
@@ -319,6 +324,9 @@ Widget::Widget(
) | rpl::start_with_next([=] {
listScrollUpdated();
}, lifetime());
_scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
return customWheelProcess(e);
});
session().data().chatsListChanges(
) | rpl::filter([=](Data::Folder *folder) {
@@ -1122,6 +1130,9 @@ void Widget::jumpToTop(bool belowPinned) {
}
void Widget::scrollToDefault(bool verytop) {
if (verytop) {
_scroll->verticalScrollBar()->setMinimum(0);
}
_scrollToAnimation.stop();
auto scrollTop = _scroll->scrollTop();
const auto scrollTo = verytop ? 0 : _inner->defaultScrollTop();
@@ -2365,6 +2376,23 @@ void Widget::completeHashtag(QString tag) {
applyFilterUpdate(true);
}
bool Widget::customWheelProcess(not_null<QWheelEvent*> e) {
const auto now = _scroll->scrollTop();
const auto def = _inner->defaultScrollTop();
const auto bar = _scroll->verticalScrollBar();
const auto allow = (def <= 0)
|| (now < def)
|| (now == def && !_allowStoriesExpandTimer.isActive());
if (allow) {
_scroll->verticalScrollBar()->setMinimum(0);
_allowStoriesExpandTimer.cancel();
} else {
bar->setMinimum(def);
_allowStoriesExpandTimer.callOnce(kWaitTillAllowStoriesExpand);
}
return false;
}
void Widget::resizeEvent(QResizeEvent *e) {
updateControlsGeometry();
}