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

Removed Ui::show from EditLinkedChatBox.

Browse source
This commit is contained in:
23rd 2022-03-03 10:42:49 +03:00
parent cacbc60302
commit 1f8f462461
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
View file

@ -19,8 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/boxes/confirm_box.h" #include "ui/boxes/confirm_box.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "facades.h"
#include "main/main_session.h" #include "main/main_session.h"
#include "window/window_session_controller.h"
#include "styles/style_layers.h" #include "styles/style_layers.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_info.h" #include "styles/style_info.h"
@ -35,7 +35,8 @@ public:
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
ChannelData *chat, ChannelData *chat,
const std::vector<not_null<PeerData*>> &chats, const std::vector<not_null<PeerData*>> &chats,
Fn<void(ChannelData*)> callback); Fn<void(ChannelData*)> callback,
Fn<void(not_null<PeerData*>)> showHistoryCallback);
Main::Session &session() const override; Main::Session &session() const override;
void prepare() override; void prepare() override;
@ -50,20 +51,24 @@ private:
ChannelData *_chat = nullptr; ChannelData *_chat = nullptr;
std::vector<not_null<PeerData*>> _chats; std::vector<not_null<PeerData*>> _chats;
Fn<void(ChannelData*)> _callback; Fn<void(ChannelData*)> _callback;
Fn<void(not_null<PeerData*>)> _showHistoryCallback;
ChannelData *_waitForFull = nullptr; ChannelData *_waitForFull = nullptr;
rpl::event_stream<not_null<PeerData*>> _showHistoryRequest;
}; };
Controller::Controller( Controller::Controller(
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
ChannelData *chat, ChannelData *chat,
const std::vector<not_null<PeerData*>> &chats, const std::vector<not_null<PeerData*>> &chats,
Fn<void(ChannelData*)> callback) Fn<void(ChannelData*)> callback,
Fn<void(not_null<PeerData*>)> showHistoryCallback)
: _channel(channel) : _channel(channel)
, _chat(chat) , _chat(chat)
, _chats(std::move(chats)) , _chats(std::move(chats))
, _callback(std::move(callback)) { , _callback(std::move(callback))
, _showHistoryCallback(std::move(showHistoryCallback)) {
channel->session().changes().peerUpdates( channel->session().changes().peerUpdates(
Data::PeerUpdate::Flag::FullInfo Data::PeerUpdate::Flag::FullInfo
) | rpl::filter([=](const Data::PeerUpdate &update) { ) | rpl::filter([=](const Data::PeerUpdate &update) {
@ -109,7 +114,7 @@ void Controller::prepare() {
void Controller::rowClicked(not_null<PeerListRow*> row) { void Controller::rowClicked(not_null<PeerListRow*> row) {
if (_chat != nullptr) { if (_chat != nullptr) {
Ui::showPeerHistory(_chat, ShowAtUnreadMsgId); _showHistoryCallback(_chat);
return; return;
} }
const auto peer = row->peer(); const auto peer = row->peer();
@ -152,7 +157,7 @@ void Controller::choose(not_null<ChannelData*> chat) {
const auto onstack = _callback; const auto onstack = _callback;
onstack(chat); onstack(chat);
}; };
Ui::show( delegate()->peerListShowBox(
Ui::MakeConfirmBox({ Ui::MakeConfirmBox({
.text = text, .text = text,
.confirmed = sure, .confirmed = sure,
@ -185,7 +190,7 @@ void Controller::choose(not_null<ChatData*> chat) {
}; };
chat->session().api().migrateChat(chat, crl::guard(this, done)); chat->session().api().migrateChat(chat, crl::guard(this, done));
}; };
Ui::show( delegate()->peerListShowBox(
Ui::MakeConfirmBox({ Ui::MakeConfirmBox({
.text = text, .text = text,
.confirmed = sure, .confirmed = sure,
@ -248,7 +253,7 @@ object_ptr<Ui::RpWidget> SetupCreateGroup(
st::infoCreateLinkedChatButton); st::infoCreateLinkedChatButton);
result->addClickHandler([=] { result->addClickHandler([=] {
const auto guarded = crl::guard(parent, callback); const auto guarded = crl::guard(parent, callback);
Ui::show( Window::Show(navigation).showBox(
Box<GroupInfoBox>( Box<GroupInfoBox>(
navigation, navigation,
GroupInfoBox::Type::Megagroup, GroupInfoBox::Type::Megagroup,
@ -312,11 +317,18 @@ object_ptr<Ui::BoxContent> EditLinkedChatBox(
: tr::lng_manage_linked_channel()); : tr::lng_manage_linked_channel());
box->addButton(tr::lng_close(), [=] { box->closeBox(); }); box->addButton(tr::lng_close(), [=] { box->closeBox(); });
}; };
auto showHistoryCallback = [=](not_null<PeerData*> peer) {
navigation->showPeerHistory(
peer,
Window::SectionShow::Way::ClearStack,
ShowAtUnreadMsgId);
};
auto controller = std::make_unique<Controller>( auto controller = std::make_unique<Controller>(
channel, channel,
chat, chat,
std::move(chats), std::move(chats),
std::move(callback)); std::move(callback),
std::move(showHistoryCallback));
return Box<PeerListBox>(std::move(controller), init); return Box<PeerListBox>(std::move(controller), init);
} }