RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-24 01:06:59 +00:00
Code Issues Projects Releases Wiki Activity

Added Window::Controller pointer to data of intro widget.

Browse Source
This commit is contained in:
23rd 2021-02-21 06:51:30 +03:00 committed by John Preston
parent c25779b844
commit 570ed5691d
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/intro/intro_widget.cpp
View File

@ -63,10 +63,12 @@ using namespace ::Intro::details;
Widget::Widget(
QWidget *parent,
not_null<Window::Controller*> controller,
not_null<Main::Account*> account,
EnterPoint point)
: RpWidget(parent)
, _account(account)
, _data(details::Data{ .controller = controller })
, _back(this, object_ptr<Ui::IconButton>(this, st::introBackButton))
, _settings(
this,

5
Telegram/SourceFiles/intro/intro_widget.h
View File

@ -29,6 +29,7 @@ class FadeWrap;
namespace Window {
class ConnectionState;
class Controller;
} // namespace Window
namespace Intro {
@ -42,6 +43,9 @@ enum class CallStatus {
};
struct Data {
// Required for the UserpicButton.
const not_null<Window::Controller*> controller;
QString country;
QString phone;
QByteArray phoneHash;
@ -91,6 +95,7 @@ class Widget
public:
Widget(
QWidget *parent,
not_null<Window::Controller*> controller,
not_null<Main::Account*> account,
EnterPoint point);

6
Telegram/SourceFiles/mainwindow.cpp
View File

@ -294,7 +294,11 @@ void MainWindow::setupIntro(Intro::EnterPoint point) {
auto bg = animated ? grabInner() : QPixmap();
destroyLayer();
auto created = object_ptr<Intro::Widget>(bodyWidget(), &account(), point);
auto created = object_ptr<Intro::Widget>(
bodyWidget(),
&controller(),
&account(),
point);
created->showSettingsRequested(
) | rpl::start_with_next([=] {
showSettings();