From 55616a4d1b05a400865975ca8d3e7aac09690ff7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 16 Nov 2017 21:19:41 +0400 Subject: [PATCH] Inject active peer profile on the stack bottom. Always have active peer profile on the bottom of third column stack. --- Telegram/SourceFiles/info/info_controller.cpp | 4 - Telegram/SourceFiles/info/info_controller.h | 1 - .../SourceFiles/info/info_wrap_widget.cpp | 92 ++++++++++++++----- Telegram/SourceFiles/info/info_wrap_widget.h | 25 ++--- 4 files changed, 81 insertions(+), 41 deletions(-) diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp index 3ed5b6bb4..9e49f04b6 100644 --- a/Telegram/SourceFiles/info/info_controller.cpp +++ b/Telegram/SourceFiles/info/info_controller.cpp @@ -89,10 +89,6 @@ rpl::producer Controller::wrapValue() const { return _widget->wrapValue(); } -bool Controller::hasStackHistory() const { - return _widget->hasStackHistory(); -} - bool Controller::validateMementoPeer( not_null memento) const { return memento->peerId() == peerId() diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h index 108f3b4dc..7fdcab38a 100644 --- a/Telegram/SourceFiles/info/info_controller.h +++ b/Telegram/SourceFiles/info/info_controller.h @@ -98,7 +98,6 @@ public: Wrap wrap() const; rpl::producer wrapValue() const; void setSection(not_null memento); - bool hasStackHistory() const; not_null window() const { return _window; diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index 0cf1a351b..2733cc08d 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -58,7 +58,7 @@ const style::InfoTopBar &TopBarStyle(Wrap wrap) { struct WrapWidget::StackItem { std::unique_ptr section; - std::unique_ptr anotherTab; +// std::unique_ptr anotherTab; }; WrapWidget::WrapWidget( @@ -91,7 +91,10 @@ WrapWidget::WrapWidget( void WrapWidget::restoreHistoryStack( std::vector> stack) { Expects(!stack.empty()); - Expects(_historyStack.empty()); + Expects(!hasStackHistory()); + + startInjectingActivePeerProfiles(); + auto content = std::move(stack.back()); stack.pop_back(); if (!stack.empty()) { @@ -105,6 +108,43 @@ void WrapWidget::restoreHistoryStack( showNewContent(content.get()); } +void WrapWidget::startInjectingActivePeerProfiles() { + using namespace rpl::mappers; + rpl::combine( + _wrap.value(), + _controller->window()->activePeer.value()) + | rpl::filter(($1 == Wrap::Side) && ($2 != nullptr)) + | rpl::map($2) + | rpl::start_with_next([this](not_null peer) { + injectActivePeerProfile(peer); + }, lifetime()); + +} + +void WrapWidget::injectActivePeerProfile(not_null peer) { + auto firstPeerId = hasStackHistory() + ? _historyStack.front().section->peerId() + : _controller->peerId(); + auto firstSectionType = hasStackHistory() + ? _historyStack.front().section->section().type() + : _controller->section().type(); + if (firstSectionType != Section::Type::Profile + || firstPeerId != peer->id) { + auto injected = StackItem(); + injected.section = std::move( + Memento(peer->id).takeStack().front()); + _historyStack.insert( + _historyStack.begin(), + std::move(injected)); + afterStackHistoryInject(); + } +} + +void WrapWidget::afterStackHistoryInject() { + setupTop(); + finishShowContent(); +} + std::unique_ptr WrapWidget::createController( not_null window, not_null memento) { @@ -230,7 +270,7 @@ void WrapWidget::forceContentRepaint() { void WrapWidget::setupTop() { // This was done for tabs support. // - //if (wrap() == Wrap::Side && _historyStack.empty()) { + //if (wrap() == Wrap::Side && !hasStackHistory()) { // setupTabbedTop(); //} else { // setupTabs(Tab::None); @@ -459,13 +499,13 @@ bool WrapWidget::requireTopBarSearch() const { void WrapWidget::showBackFromStack() { auto params = Window::SectionShow( Window::SectionShow::Way::Backward); - if (!_historyStack.empty()) { + if (hasStackHistory()) { auto last = std::move(_historyStack.back()); _historyStack.pop_back(); showNewContent( last.section.get(), params); - _anotherTabMemento = std::move(last.anotherTab); + //_anotherTabMemento = std::move(last.anotherTab); } else { _controller->window()->showBackFromStack(params); } @@ -483,12 +523,12 @@ not_null WrapWidget::topWidget() const { void WrapWidget::showContent(object_ptr content) { _content = std::move(content); _content->show(); - _anotherTabMemento = nullptr; + //_anotherTabMemento = nullptr; finishShowContent(); } void WrapWidget::finishShowContent() { - _content->setIsStackBottom(_historyStack.empty()); + _content->setIsStackBottom(!hasStackHistory()); updateContentGeometry(); _desiredHeights.fire(desiredHeightForContent()); _desiredShadowVisibilities.fire(_content->desiredShadowVisibility()); @@ -528,19 +568,21 @@ rpl::producer WrapWidget::selectedListValue() const { return _selectedLists.events() | rpl::flatten_latest(); } -std::unique_ptr WrapWidget::createTabMemento( - Tab tab) { - switch (tab) { - case Tab::Profile: return std::make_unique( - _controller->peerId(), - _controller->migratedPeerId()); - case Tab::Media: return std::make_unique( - _controller->peerId(), - _controller->migratedPeerId(), - Media::Type::Photo); - } - Unexpected("Tab value in Info::WrapWidget::createInner()"); -} +// Was done for top level tabs support. +// +//std::unique_ptr WrapWidget::createTabMemento( +// Tab tab) { +// switch (tab) { +// case Tab::Profile: return std::make_unique( +// _controller->peerId(), +// _controller->migratedPeerId()); +// case Tab::Media: return std::make_unique( +// _controller->peerId(), +// _controller->migratedPeerId(), +// Media::Type::Photo); +// } +// Unexpected("Tab value in Info::WrapWidget::createInner()"); +//} object_ptr WrapWidget::createContent( not_null memento, @@ -554,7 +596,7 @@ object_ptr WrapWidget::createContent( // Was done for top level tabs support. // //void WrapWidget::convertProfileFromStackToTab() { -// if (_historyStack.empty()) { +// if (!hasStackHistory()) { // return; // } // auto &entry = _historyStack[0]; @@ -641,7 +683,7 @@ bool WrapWidget::showInternal( return false; } auto content = infoMemento->content(); - auto skipInternal = !_historyStack.empty() + auto skipInternal = hasStackHistory() && (params.way == Window::SectionShow::Way::ClearStack); if (_controller->validateMementoPeer(content) && infoMemento->stackSize() == 1) { @@ -731,9 +773,9 @@ void WrapWidget::showNewContent( if (saveToStack) { auto item = StackItem(); item.section = _content->createMemento(); - if (_anotherTabMemento) { - item.anotherTab = std::move(_anotherTabMemento); - } + //if (_anotherTabMemento) { + // item.anotherTab = std::move(_anotherTabMemento); + //} _historyStack.push_back(std::move(item)); } else if (params.way == Window::SectionShow::Way::ClearStack) { _historyStack.clear(); diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index 5468147bb..7cc95d7b8 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -98,9 +98,6 @@ public: return _wrap.value(); } void setWrap(Wrap wrap); - bool hasStackHistory() const { - return !_historyStack.empty(); - } not_null controller() { return _controller.get(); @@ -141,15 +138,21 @@ protected: private: using SlideDirection = Window::SlideDirection; using SectionSlideParams = Window::SectionSlideParams; - enum class Tab { - Profile, - Media, - None, - }; + //enum class Tab { + // Profile, + // Media, + // None, + //}; struct StackItem; + void startInjectingActivePeerProfiles(); + void afterStackHistoryInject(); + void injectActivePeerProfile(not_null peer); void restoreHistoryStack( std::vector> stack); + bool hasStackHistory() const { + return !_historyStack.empty(); + } void showBackFromStack(); void showNewContent(not_null memento); void showNewContent( @@ -172,7 +175,7 @@ private: //void showTab(Tab tab); void showContent(object_ptr content); - std::unique_ptr createTabMemento(Tab tab); + //std::unique_ptr createTabMemento(Tab tab); object_ptr createContent( not_null memento, not_null controller); @@ -205,8 +208,8 @@ private: base::unique_qptr _topBarMenuToggle; base::unique_qptr _topBarMenu; - Tab _tab = Tab::Profile; - std::unique_ptr _anotherTabMemento; +// Tab _tab = Tab::Profile; +// std::unique_ptr _anotherTabMemento; std::vector _historyStack; rpl::event_stream> _desiredHeights;