diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index d1236add3b..ac7b80c848 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -1915,7 +1915,7 @@ void Widget::updateControlsVisibility(bool fast) { _frozenAccountBar->show(); } if (_chatFilters) { - _chatFilters->setVisible(!_openedForum && !_openedCommunity); + _chatFilters->setVisible(!_openedForum); } updateCommunityOverlaysVisibility(); if (_openedFolder || _openedForum || _openedCommunity) { @@ -2028,7 +2028,10 @@ void Widget::toggleFiltersMenu(bool enabled) { Window::GifPauseReason::Any, controller(), true); - raw->show(); + raw->setVisible(_searchState.query.isEmpty() + && !_openedForum + && !_searchState.community + && !searchInPeer()); raw->stackUnder(_scroll); raw->resizeToWidth(width()); const auto shadow = Ui::CreateChild(raw); @@ -2659,7 +2662,7 @@ void Widget::scrollToDefault(bool verytop) { this, QPoint(), QRect(0, top, wideGeometry.width(), skip)); - if (_chatFilters) { + if (_chatFilters && !_chatFilters->isHidden()) { Ui::RenderWidget( p, _chatFilters, @@ -2697,9 +2700,7 @@ void Widget::stopWidthAnimation() { _frozenAccountBar->setVisible(!_suggestions); } if (_chatFilters) { - _chatFilters->setVisible(!_suggestions - && !_openedForum - && !_openedCommunity); + _chatFilters->setVisible(!_suggestions && !_openedForum); } } updateStoriesVisibility(); @@ -4081,7 +4082,6 @@ bool Widget::applySearchState(SearchState state) { && (queryEmptyChanged || inChatChanged || communityChanged)) { _chatFilters->setVisible(_searchState.query.isEmpty() && !_openedForum - && !_openedCommunity && !_searchState.community && !searchInPeer()); updateControlsGeometry(); @@ -4536,7 +4536,7 @@ void Widget::updateControlsGeometry() { + ((_chatFilters && _searchState.query.isEmpty() && !_openedForum - && !_openedCommunity + && !_searchState.community && !searchInPeer()) ? (_chatFilters->height() * (1. - narrowRatio)) : 0);