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

Renamed BoxContent::onScrollToY to BoxContent::scrollToY.

Browse source
This commit is contained in:
23rd 2022-02-23 04:11:34 +03:00 • committed by John Preston
parent 06d5d8859a
commit ed14e47389
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/boxes/language_box.cpp
View file

@ -1143,7 +1143,7 @@ void LanguageBox::keyPressEvent(QKeyEvent *e) {
return Ui::ScrollToRequest(-1, -1); return Ui::ScrollToRequest(-1, -1);
}(); }();
if (selected.ymin >= 0 && selected.ymax >= 0) { if (selected.ymin >= 0 && selected.ymax >= 0) {
onScrollToY(selected.ymin, selected.ymax); scrollToY(selected.ymin, selected.ymax);
} }
} }

8
Telegram/SourceFiles/boxes/peer_list_box.cpp
View file

@ -138,12 +138,12 @@ void PeerListBox::prepare() {
_select->finishAnimating(); _select->finishAnimating();
Ui::SendPendingMoveResizeEvents(_select); Ui::SendPendingMoveResizeEvents(_select);
_scrollBottomFixed = true; _scrollBottomFixed = true;
onScrollToY(0); scrollToY(0);
} }
content()->scrollToRequests( content()->scrollToRequests(
) | rpl::start_with_next([this](Ui::ScrollToRequest request) { ) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
onScrollToY(request.ymin, request.ymax); scrollToY(request.ymin, request.ymax);
}, lifetime()); }, lifetime());
if (_init) { if (_init) {
@ -168,7 +168,7 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
} }
void PeerListBox::searchQueryChanged(const QString &query) { void PeerListBox::searchQueryChanged(const QString &query) {
onScrollToY(0); scrollToY(0);
content()->searchQueryChanged(query); content()->searchQueryChanged(query);
} }
@ -244,7 +244,7 @@ void PeerListBox::peerListSetForeignRowChecked(
} }
void PeerListBox::peerListScrollToTop() { void PeerListBox::peerListScrollToTop() {
onScrollToY(0); scrollToY(0);
} }
void PeerListBox::peerListSetSearchMode(PeerListSearchMode mode) { void PeerListBox::peerListSetSearchMode(PeerListSearchMode mode) {

8
Telegram/SourceFiles/boxes/peer_lists_box.cpp
View file

@ -158,7 +158,7 @@ void PeerListsBox::prepare() {
content->scrollToRequests( content->scrollToRequests(
) | rpl::start_with_next([=](Ui::ScrollToRequest request) { ) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
const auto skip = content->y(); const auto skip = content->y();
onScrollToY( scrollToY(
skip + request.ymin, skip + request.ymin,
(request.ymax >= 0) ? (skip + request.ymax) : request.ymax); (request.ymax >= 0) ? (skip + request.ymax) : request.ymax);
}, lifetime()); }, lifetime());
@ -181,7 +181,7 @@ void PeerListsBox::prepare() {
_select->finishAnimating(); _select->finishAnimating();
Ui::SendPendingMoveResizeEvents(_select); Ui::SendPendingMoveResizeEvents(_select);
_scrollBottomFixed = true; _scrollBottomFixed = true;
onScrollToY(0); scrollToY(0);
} }
if (_init) { if (_init) {
@ -256,7 +256,7 @@ void PeerListsBox::keyPressEvent(QKeyEvent *e) {
} }
void PeerListsBox::searchQueryChanged(const QString &query) { void PeerListsBox::searchQueryChanged(const QString &query) {
onScrollToY(0); scrollToY(0);
for (const auto &list : _lists) { for (const auto &list : _lists) {
list.content->searchQueryChanged(query); list.content->searchQueryChanged(query);
} }
@ -343,7 +343,7 @@ void PeerListsBox::Delegate::peerListSetForeignRowChecked(
} }
void PeerListsBox::Delegate::peerListScrollToTop() { void PeerListsBox::Delegate::peerListScrollToTop() {
_box->onScrollToY(0); _box->scrollToY(0);
} }
void PeerListsBox::Delegate::peerListSetSearchMode(PeerListSearchMode mode) { void PeerListsBox::Delegate::peerListSetSearchMode(PeerListSearchMode mode) {

4
Telegram/SourceFiles/boxes/share_box.cpp
View file

@ -553,7 +553,7 @@ void ShareBox::createButtons() {
} }
void ShareBox::applyFilterUpdate(const QString &query) { void ShareBox::applyFilterUpdate(const QString &query) {
onScrollToY(0); scrollToY(0);
_inner->updateFilter(query); _inner->updateFilter(query);
} }
@ -624,7 +624,7 @@ void ShareBox::selectedChanged() {
} }
void ShareBox::scrollTo(Ui::ScrollToRequest request) { void ShareBox::scrollTo(Ui::ScrollToRequest request) {
onScrollToY(request.ymin, request.ymax); scrollToY(request.ymin, request.ymax);
//auto scrollTop = scrollArea()->scrollTop(), scrollBottom = scrollTop + scrollArea()->height(); //auto scrollTop = scrollArea()->scrollTop(), scrollBottom = scrollTop + scrollArea()->height();
//auto from = scrollTop, to = scrollTop; //auto from = scrollTop, to = scrollTop;
//if (scrollTop > top) { //if (scrollTop > top) {

6
Telegram/SourceFiles/boxes/stickers_box.cpp
View file

@ -408,7 +408,7 @@ StickersBox::StickersBox(
, _megagroupSet(megagroup) { , _megagroupSet(megagroup) {
_installed.widget()->scrollsToY( _installed.widget()->scrollsToY(
) | rpl::start_with_next([=](int y) { ) | rpl::start_with_next([=](int y) {
onScrollToY(y); scrollToY(y);
}, lifetime()); }, lifetime());
} }
@ -786,7 +786,7 @@ void StickersBox::switchTab() {
session().api().updateMasks(); session().api().updateMasks();
} }
if (_tab == newTab) { if (_tab == newTab) {
onScrollToY(0); scrollToY(0);
return; return;
} }
@ -808,7 +808,7 @@ void StickersBox::switchTab() {
_unreadBadge->raise(); _unreadBadge->raise();
_tab->widget()->show(); _tab->widget()->show();
rebuildList(); rebuildList();
onScrollToY(_tab->getScrollTop()); scrollToY(_tab->getScrollTop());
setInnerVisible(true); setInnerVisible(true);
auto nowCache = grabContentCache(); auto nowCache = grabContentCache();
auto nowIndex = _tab->index(); auto nowIndex = _tab->index();

4
Telegram/SourceFiles/ui/boxes/country_select_box.cpp
View file

@ -135,7 +135,7 @@ void CountrySelectBox::prepare() {
_inner->mustScrollTo( _inner->mustScrollTo(
) | rpl::start_with_next([=](ScrollToRequest request) { ) | rpl::start_with_next([=](ScrollToRequest request) {
onScrollToY(request.ymin, request.ymax); scrollToY(request.ymin, request.ymax);
}, lifetime()); }, lifetime());
} }
@ -167,7 +167,7 @@ void CountrySelectBox::resizeEvent(QResizeEvent *e) {
} }
void CountrySelectBox::applyFilterUpdate(const QString &query) { void CountrySelectBox::applyFilterUpdate(const QString &query) {
onScrollToY(0); scrollToY(0);
_inner->updateFilter(query); _inner->updateFilter(query);
} }

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit d6cdc810c456d902b6f1398f96b197dfc8ffdf19 Subproject commit 4ba28e2fec2ab86fb539a4cfe08b9bd1803f8fcf