hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hide LoadMore button in search mode.

Browse source
This commit is contained in:
John Preston 2018-12-30 11:34:17 +04:00
parent ea7796dccc
commit 2c3190ce2a
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View file

@ -453,7 +453,6 @@ void DialogsWidget::dialogsReceived(
if (!_dialogsRequestId) { if (!_dialogsRequestId) {
refreshLoadMoreButton(); refreshLoadMoreButton();
} }
refreshSupportFilteredResults();
Auth().data().moreChatsLoaded().notify(); Auth().data().moreChatsLoaded().notify();
if (_dialogsFull && _pinnedDialogsReceived) { if (_dialogsFull && _pinnedDialogsReceived) {
@ -462,15 +461,6 @@ void DialogsWidget::dialogsReceived(
Auth().api().requestContacts(); Auth().api().requestContacts();
} }
void DialogsWidget::refreshSupportFilteredResults() {
if (!Auth().supportMode()) {
return;
}
const auto top = _scroll->scrollTop();
applyFilterUpdate(true);
_scroll->scrollToY(top);
}
void DialogsWidget::updateDialogsOffset( void DialogsWidget::updateDialogsOffset(
const QVector<MTPDialog> &dialogs, const QVector<MTPDialog> &dialogs,
const QVector<MTPMessage> &messages) { const QVector<MTPMessage> &messages) {
@ -544,7 +534,9 @@ void DialogsWidget::refreshLoadMoreButton() {
} }
void DialogsWidget::loadMoreBlockedByDateChats() { void DialogsWidget::loadMoreBlockedByDateChats() {
if (!_loadMoreChats || _loadMoreChats->isDisabled()) { if (!_loadMoreChats
|| _loadMoreChats->isDisabled()
|| _loadMoreChats->isHidden()) {
return; return;
} }
const auto max = Auth().settings().supportChatsTimeSlice(); const auto max = Auth().settings().supportChatsTimeSlice();
@ -1141,7 +1133,9 @@ void DialogsWidget::onListScroll() {
} }
void DialogsWidget::applyFilterUpdate(bool force) { void DialogsWidget::applyFilterUpdate(bool force) {
if (_a_show.animating() && !force) return; if (_a_show.animating() && !force) {
return;
}
auto filterText = _filter->getLastText(); auto filterText = _filter->getLastText();
_inner->applyFilterUpdate(filterText, force); _inner->applyFilterUpdate(filterText, force);
@ -1149,6 +1143,10 @@ void DialogsWidget::applyFilterUpdate(bool force) {
clearSearchCache(); clearSearchCache();
} }
_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal); _cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
if (_loadMoreChats) {
_loadMoreChats->setVisible(filterText.isEmpty());
updateControlsGeometry();
}
updateJumpToDateVisibility(); updateJumpToDateVisibility();
if (filterText.isEmpty()) { if (filterText.isEmpty()) {
@ -1345,7 +1343,7 @@ void DialogsWidget::updateControlsGeometry() {
auto newScrollTop = _scroll->scrollTop() + addToScroll; auto newScrollTop = _scroll->scrollTop() + addToScroll;
auto scrollHeight = height() - scrollTop; auto scrollHeight = height() - scrollTop;
const auto putBottomButton = [&](object_ptr<BottomButton> &button) { const auto putBottomButton = [&](object_ptr<BottomButton> &button) {
if (button) { if (button && !button->isHidden()) {
const auto buttonHeight = button->height(); const auto buttonHeight = button->height();
scrollHeight -= buttonHeight; scrollHeight -= buttonHeight;
button->setGeometry( button->setGeometry(

1
Telegram/SourceFiles/dialogs/dialogs_widget.h
View file

@ -162,7 +162,6 @@ private:
void checkUpdateStatus(); void checkUpdateStatus();
void applyFilterUpdate(bool force = false); void applyFilterUpdate(bool force = false);
void refreshSupportFilteredResults();
bool loadingBlockedByDate() const; bool loadingBlockedByDate() const;
void refreshLoadMoreButton(); void refreshLoadMoreButton();
void loadMoreBlockedByDateChats(); void loadMoreBlockedByDateChats();