procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Removed Ui::show from ShowSearchFromBox.

Browse source
This commit is contained in:
23rd 2022-03-21 15:44:37 +03:00 committed by John Preston
parent 38abfacd88
commit 89ab23e70f
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
View file

@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Dialogs {
void ShowSearchFromBox(
object_ptr<Ui::BoxContent> SearchFromBox(
not_null<PeerData*> peer,
Fn<void(not_null<PeerData*>)> callback,
Fn<void()> closedCallback) {
@ -34,15 +34,19 @@ void ShowSearchFromBox(
};
if (auto controller = createController()) {
auto subscription = std::make_shared<rpl::lifetime>();
auto box = Ui::show(Box<PeerListBox>(std::move(controller), [subscription](not_null<PeerListBox*> box) {
box->addButton(tr::lng_cancel(), [box, subscription] {
box->closeBox();
auto box = Box<PeerListBox>(
std::move(controller),
[subscription](not_null<PeerListBox*> box) {
box->addButton(tr::lng_cancel(), [box, subscription] {
box->closeBox();
});
});
}), Ui::LayerOption::KeepOther);
box->boxClosing() | rpl::start_with_next(
std::move(closedCallback),
*subscription);
return box;
}
return nullptr;
}
SearchFromController::SearchFromController(

2
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
View file

@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Dialogs {
void ShowSearchFromBox(
object_ptr<Ui::BoxContent> SearchFromBox(
not_null<PeerData*> peer,
Fn<void(not_null<PeerData*>)> callback,
Fn<void()> closedCallback);

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

@ -1537,7 +1537,7 @@ void Widget::showCalendar() {
void Widget::showSearchFrom() {
if (const auto peer = _searchInChat.peer()) {
const auto chat = _searchInChat;
ShowSearchFromBox(
auto box = SearchFromBox(
peer,
crl::guard(this, [=](not_null<PeerData*> from) {
Ui::hideLayer();
@ -1545,6 +1545,9 @@ void Widget::showSearchFrom() {
applyFilterUpdate(true);
}),
crl::guard(this, [=] { _filter->setFocus(); }));
if (box) {
Window::Show(controller()).showBox(std::move(box));
}
}
}