mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-29 00:39:55 +00:00
Merge v4.14.13
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp # Telegram/SourceFiles/history/view/media/history_view_photo.cpp # Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp # Telegram/SourceFiles/mainwidget.cpp # Telegram/lib_ui
This commit is contained in:
@@ -982,6 +982,16 @@ void SessionNavigation::showPollResults(
|
||||
showSection(std::make_shared<Info::Memento>(poll, contextId), params);
|
||||
}
|
||||
|
||||
void SessionNavigation::searchInChat(Dialogs::Key inChat) {
|
||||
searchMessages(QString(), inChat);
|
||||
}
|
||||
|
||||
void SessionNavigation::searchMessages(
|
||||
const QString &query,
|
||||
Dialogs::Key inChat) {
|
||||
parentController()->content()->searchMessages(query, inChat);
|
||||
}
|
||||
|
||||
auto SessionNavigation::showToast(Ui::Toast::Config &&config)
|
||||
-> base::weak_ptr<Ui::Toast::Instance> {
|
||||
return uiShow()->showToast(std::move(config));
|
||||
@@ -1329,7 +1339,7 @@ void SessionController::activateFirstChatsFilter() {
|
||||
bool SessionController::uniqueChatsInSearchResults() const {
|
||||
return session().supportMode()
|
||||
&& !session().settings().supportAllSearchResults()
|
||||
&& !searchInChat.current();
|
||||
&& !_searchInChat.current();
|
||||
}
|
||||
|
||||
void SessionController::openFolder(not_null<Data::Folder*> folder) {
|
||||
|
||||
Reference in New Issue
Block a user