mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Remove some usages of App::main().

Browse Source
This commit is contained in:
John Preston
2020-06-10 22:08:17 +04:00
parent ea86433be5
commit ee43027bea
53 changed files with 518 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/settings/settings_chat.cpp
View File

@@ -393,7 +393,7 @@ private:
};
void ChooseFromFile(
not_null<::Main::Session*> session,
not_null<Window::SessionController*> controller,
not_null<QWidget*> parent);
BackgroundRow::BackgroundRow(
@@ -409,10 +409,10 @@ BackgroundRow::BackgroundRow(
updateImage();
_chooseFromGallery->addClickHandler([=] {
Ui::show(Box<BackgroundBox>(&controller->session()));
Ui::show(Box<BackgroundBox>(controller));
});
_chooseFromFile->addClickHandler([=] {
ChooseFromFile(&controller->session(), this);
ChooseFromFile(controller, this);
});
using Update = const Window::Theme::BackgroundUpdate;
@@ -594,7 +594,7 @@ void BackgroundRow::updateImage() {
}
void ChooseFromFile(
not_null<::Main::Session*> session,
not_null<Window::SessionController*> controller,
not_null<QWidget*> parent) {
const auto &imgExtensions = cImgExtensions();
auto filters = QStringList(
@@ -602,7 +602,7 @@ void ChooseFromFile(
+ imgExtensions.join(qsl(" *"))
+ qsl(")"));
filters.push_back(FileDialog::AllFilesFilter());
const auto callback = crl::guard(session, [=](
const auto callback = crl::guard(controller, [=](
const FileDialog::OpenResult &result) {
if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
return;
@@ -629,7 +629,7 @@ void ChooseFromFile(
auto local = Data::CustomWallPaper();
local.setLocalImageAsThumbnail(std::make_shared<Image>(
std::move(image)));
Ui::show(Box<BackgroundPreviewBox>(session, local));
Ui::show(Box<BackgroundPreviewBox>(controller, local));
});
FileDialog::GetOpenPath(
parent.get(),