From a7725f03bbb72a8144473feee7ded2343885b635 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 5 Sep 2018 22:39:35 +0300 Subject: [PATCH] Add cover to settings main section. --- .../info/profile/info_profile_cover.cpp | 12 +++++------- .../info/profile/info_profile_cover.h | 15 +++++++++++++-- .../info/profile/info_profile_inner_widget.cpp | 7 ++++++- .../info/settings/info_settings_widget.cpp | 8 ++++++-- .../SourceFiles/settings/settings_common.cpp | 3 ++- Telegram/SourceFiles/settings/settings_common.h | 5 +++++ Telegram/SourceFiles/settings/settings_main.cpp | 16 +++++++++++++--- Telegram/SourceFiles/settings/settings_main.h | 11 +++++++++-- 8 files changed, 59 insertions(+), 18 deletions(-) diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp index 4b3b0ede6..eb32d25e4 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp @@ -212,17 +212,17 @@ int SectionWithToggle::toggleSkip() const { Cover::Cover( QWidget *parent, - not_null controller) + not_null peer, + not_null controller) : SectionWithToggle( parent, st::infoProfilePhotoTop + st::infoProfilePhoto.size.height() + st::infoProfilePhotoBottom) -, _controller(controller) -, _peer(_controller->key().peer()) +, _peer(peer) , _userpic( this, - controller->parentController(), + controller, _peer, Ui::UserpicButton::Role::OpenPhoto, st::infoProfilePhoto) @@ -376,9 +376,7 @@ void Cover::refreshStatusText() { _status->setRichText(statusText); if (hasMembersLink) { _status->setLink(1, std::make_shared([=] { - _controller->showSection(Info::Memento( - _controller->peerId(), - Section::Type::Members)); + _showSection.fire(Section::Type::Members); })); } refreshStatusGeometry(width()); diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h index 07ba89205..bf089e542 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.h +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h @@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/checkbox.h" #include "base/timer.h" +namespace Window { +class Controller; +} // namespace Window + namespace style { struct InfoToggle; } // namespace style @@ -24,6 +28,7 @@ class SlideWrap; namespace Info { class Controller; +class Section; } // namespace Info namespace Info { @@ -52,7 +57,8 @@ class Cover : public SectionWithToggle { public: Cover( QWidget *parent, - not_null controller); + not_null peer, + not_null controller); Cover *setOnlineCount(rpl::producer &&count); @@ -61,6 +67,10 @@ public: SectionWithToggle::setToggleShown(std::move(shown))); } + rpl::producer
showSection() const { + return _showSection.events(); + } + ~Cover(); private: @@ -73,7 +83,6 @@ private: void refreshUploadPhotoOverlay(); void setVerified(bool verified); - not_null _controller; not_null _peer; int _onlineCount = 0; @@ -84,6 +93,8 @@ private: //object_ptr _dropArea = { nullptr }; base::Timer _refreshStatusTimer; + rpl::event_stream
_showSection; + }; class SharedMediaCover : public SectionWithToggle { diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 011045463..16fc05c85 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -77,7 +77,12 @@ object_ptr InnerWidget::setupContent( auto result = object_ptr(parent); _cover = result->add(object_ptr( result, - _controller)); + _peer, + _controller->parentController())); + _cover->showSection( + ) | rpl::start_with_next([=](Section section) { + _controller->showSection(Info::Memento(_peer->id, section)); + }, _cover->lifetime()); _cover->setOnlineCount(rpl::single(0)); auto details = SetupDetails(_controller, parent, _peer); if (canHideDetailsEver()) { diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp index 022d4e810..6914c2269 100644 --- a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp +++ b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/settings/info_settings_widget.h" #include "info/info_memento.h" +#include "info/info_controller.h" #include "settings/settings_common.h" namespace Info { @@ -41,8 +42,11 @@ Widget::Widget( : ContentWidget(parent, controller) , _self(controller->key().settingsSelf()) , _type(controller->section().settingsType()) { - const auto inner = setInnerWidget( - ::Settings::CreateSection(_type, this, _self)); + const auto inner = setInnerWidget(::Settings::CreateSection( + _type, + this, + controller->parentController(), + _self)); inner->sectionShowOther( ) | rpl::start_with_next([=](Type type) { this->controller()->showSettings(type); diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index 17fe2b128..f41d5d0a6 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -19,10 +19,11 @@ namespace Settings { object_ptr
CreateSection( Type type, not_null parent, + not_null controller, UserData *self) { switch (type) { case Type::Main: - return object_ptr<::Settings::Main>(parent, self); + return object_ptr<::Settings::Main>(parent, controller, self); case Type::Information: return object_ptr<::Settings::Information>(parent, self); case Type::Notifications: diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h index bdaa21ff2..c1b453cb1 100644 --- a/Telegram/SourceFiles/settings/settings_common.h +++ b/Telegram/SourceFiles/settings/settings_common.h @@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/rp_widget.h" +namespace Window { +class Controller; +} // namespace Window + namespace Info { namespace Profile { class Button; @@ -41,6 +45,7 @@ public: object_ptr
CreateSection( Type type, not_null parent, + not_null controller, UserData *self = nullptr); } // namespace Settings diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index 80f817f8c..4c6effa9f 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -11,20 +11,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/abstract_box.h" #include "ui/wrap/vertical_layout.h" #include "info/profile/info_profile_button.h" +#include "info/profile/info_profile_cover.h" #include "lang/lang_keys.h" #include "styles/style_settings.h" namespace Settings { -Main::Main(QWidget *parent, not_null self) +Main::Main( + QWidget *parent, + not_null controller, + not_null self) : Section(parent) , _self(self) { - setupContent(); + setupContent(controller); } -void Main::setupContent() { +void Main::setupContent(not_null controller) { const auto content = Ui::CreateChild(this); + const auto cover = content->add(object_ptr( + content, + _self, + controller)); + cover->setOnlineCount(rpl::single(0)); + content->add(object_ptr(content)); const auto addSection = [&](LangKey label, Type type) { diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h index e97172816..98a6eef65 100644 --- a/Telegram/SourceFiles/settings/settings_main.h +++ b/Telegram/SourceFiles/settings/settings_main.h @@ -9,16 +9,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_common.h" +namespace Window { +class Controller; +} // namespace Window + namespace Settings { class Main : public Section { public: - Main(QWidget *parent, not_null self); + Main( + QWidget *parent, + not_null controller, + not_null self); rpl::producer sectionShowOther() override; private: - void setupContent(); + void setupContent(not_null controller); not_null _self; rpl::event_stream _showOther;