From e1c68892d40b436a1ed741738f8261303bb9f348 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 4 Dec 2017 11:33:33 +0400 Subject: [PATCH] Show third column only when explicitly requested. This allows you to show info in layer from mention links. --- .../boxes/peers/manage_peer_box.cpp | 4 +- .../dialogs_search_from_controllers.cpp | 24 ++++++--- .../dialogs/dialogs_search_from_controllers.h | 6 +-- .../history/history_top_bar_widget.cpp | 4 +- .../SourceFiles/history/history_widget.cpp | 6 +-- Telegram/SourceFiles/info/info_controller.cpp | 14 +++++ Telegram/SourceFiles/info/info_controller.h | 16 ++++-- .../SourceFiles/info/info_layer_widget.cpp | 48 +++++++++-------- .../SourceFiles/info/info_wrap_widget.cpp | 19 ++++--- Telegram/SourceFiles/info/info_wrap_widget.h | 2 +- .../info/media/info_media_buttons.h | 12 ++--- .../info/media/info_media_inner_widget.cpp | 4 +- .../profile/info_profile_inner_widget.cpp | 4 +- .../info/profile/info_profile_members.cpp | 2 +- .../info_profile_members_controllers.cpp | 18 +++---- .../info_profile_members_controllers.h | 4 +- Telegram/SourceFiles/mainwidget.cpp | 16 +++--- .../SourceFiles/mtproto/config_loader.cpp | 10 ++-- .../mtproto/special_config_request.cpp | 3 ++ .../profile/profile_channel_controllers.cpp | 12 ++--- .../profile/profile_channel_controllers.h | 8 +-- .../SourceFiles/window/window_controller.cpp | 16 +++--- .../SourceFiles/window/window_controller.h | 52 +++++++++++++------ 23 files changed, 184 insertions(+), 120 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp index 5fd40370d..878b98653 100644 --- a/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp @@ -101,9 +101,7 @@ bool HasRecentActions(not_null channel) { void ShowRecentActions( not_null controller, not_null channel) { - controller->showSection( - AdminLog::SectionMemento(channel), - Window::SectionShow()); + controller->showSection(AdminLog::SectionMemento(channel)); } diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp index 364066711..49d7ba874 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp @@ -28,16 +28,26 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace Dialogs { void ShowSearchFromBox( - not_null window, + not_null navigation, not_null peer, base::lambda)> callback, base::lambda closedCallback) { - auto createController = [window, peer, callback = std::move(callback)]() -> std::unique_ptr { + auto createController = [ + navigation, + peer, + callback = std::move(callback) + ]() -> std::unique_ptr { if (peer) { if (auto chat = peer->asChat()) { - return std::make_unique(window, chat, std::move(callback)); + return std::make_unique( + navigation, + chat, + std::move(callback)); } else if (auto group = peer->asMegagroup()) { - return std::make_unique(window, group, std::move(callback)); + return std::make_unique( + navigation, + group, + std::move(callback)); } } return nullptr; @@ -52,7 +62,7 @@ void ShowSearchFromBox( } ChatSearchFromController::ChatSearchFromController( - not_null window, + not_null navigation, not_null chat, base::lambda)> callback) : PeerListController() @@ -123,11 +133,11 @@ void ChatSearchFromController::appendRow(not_null user) { } ChannelSearchFromController::ChannelSearchFromController( - not_null window, + not_null navigation, not_null channel, base::lambda)> callback) : ParticipantsBoxController( - window, + navigation, channel, ParticipantsBoxController::Role::Members) , _callback(std::move(callback)) { diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h index d65ad3fde..074f59a41 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h +++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org namespace Dialogs { void ShowSearchFromBox( - not_null window, + not_null navigation, not_null peer, base::lambda)> callback, base::lambda closedCallback); @@ -34,7 +34,7 @@ void ShowSearchFromBox( class ChatSearchFromController : public PeerListController, protected base::Subscriber { public: ChatSearchFromController( - not_null window, + not_null navigation, not_null chat, base::lambda)> callback); @@ -54,7 +54,7 @@ private: class ChannelSearchFromController : public Profile::ParticipantsBoxController { public: ChannelSearchFromController( - not_null window, + not_null navigation, not_null channel, base::lambda)> callback); diff --git a/Telegram/SourceFiles/history/history_top_bar_widget.cpp b/Telegram/SourceFiles/history/history_top_bar_widget.cpp index 3048f080b..a88cadbc8 100644 --- a/Telegram/SourceFiles/history/history_top_bar_widget.cpp +++ b/Telegram/SourceFiles/history/history_top_bar_widget.cpp @@ -242,7 +242,9 @@ void HistoryTopBarWidget::toggleInfoSection() { Auth().data().setThirdSectionInfoEnabled(true); Auth().saveDataDelayed(); if (Adaptive::ThreeColumn()) { - _controller->showSection(Info::Memento(_historyPeer->id)); + _controller->showSection( + Info::Memento(_historyPeer->id), + Window::SectionShow().withThirdColumn()); } else { _controller->resizeForThirdSection(); _controller->updateColumnLayout(); diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 191c21767..370a1ffdf 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -3887,7 +3887,7 @@ void HistoryWidget::pushTabbedSelectorToThirdSection( return; } else if (!_canSendMessages) { Auth().data().setTabbedReplacedWithInfo(true); - controller()->showPeerInfo(_peer, params); + controller()->showPeerInfo(_peer, params.withThirdColumn()); return; } Auth().data().setTabbedReplacedWithInfo(false); @@ -3903,7 +3903,7 @@ void HistoryWidget::pushTabbedSelectorToThirdSection( returnTabbedSelector(std::move(selector)); })); controller()->resizeForThirdSection(); - controller()->showSection(std::move(memento), params); + controller()->showSection(std::move(memento), params.withThirdColumn()); destroyingPanel.destroy(); } @@ -3912,7 +3912,7 @@ void HistoryWidget::pushInfoToThirdSection( if (!_peer) { return; } - controller()->showPeerInfo(_peer, params); + controller()->showPeerInfo(_peer, params.withThirdColumn()); } void HistoryWidget::toggleTabbedSelectorMode() { diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp index 3da0ac88f..aafd96a96 100644 --- a/Telegram/SourceFiles/info/info_controller.cpp +++ b/Telegram/SourceFiles/info/info_controller.cpp @@ -157,6 +157,20 @@ void Controller::saveSearchState(not_null memento) { } } +void Controller::showSection( + Window::SectionMemento &&memento, + const Window::SectionShow ¶ms) { + if (!_widget->showInternal(&memento, params)) { + _window->showSection(std::move(memento), params); + } +} + +void Controller::showBackFromStack(const Window::SectionShow ¶ms) { + if (!_widget->showBackFromStackInternal(params)) { + _window->showBackFromStack(params); + } +} + auto Controller::produceSearchQuery( const QString &query) const -> SearchQuery { auto result = SearchQuery(); diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h index 2127d72af..9998b4e42 100644 --- a/Telegram/SourceFiles/info/info_controller.h +++ b/Telegram/SourceFiles/info/info_controller.h @@ -22,15 +22,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include "data/data_search_controller.h" +#include "window/window_controller.h" namespace Ui { class SearchFieldController; } // namespace Ui -namespace Window { -class Controller; -} // namespace Window - namespace Info { enum class Wrap; @@ -70,7 +67,7 @@ private: }; -class Controller { +class Controller : public Window::Navigation { public: Controller( not_null widget, @@ -118,6 +115,15 @@ public: void saveSearchState(not_null memento); + void showSection( + Window::SectionMemento &&memento, + const Window::SectionShow ¶ms = Window::SectionShow()) override; + void showBackFromStack( + const Window::SectionShow ¶ms = Window::SectionShow()) override; + not_null parentController() override { + return _window; + } + rpl::lifetime &lifetime() { return _lifetime; } diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp index 1b04ad295..50d2cb851 100644 --- a/Telegram/SourceFiles/info/info_layer_widget.cpp +++ b/Telegram/SourceFiles/info/info_layer_widget.cpp @@ -86,8 +86,8 @@ void LayerWidget::parentResized() { Window::SectionShow::Way::Forward, anim::type::instant, anim::activation::background)); - } else if (_controller->canShowThirdSectionWithoutResize()) { - takeToThirdSection(); + //} else if (_controller->canShowThirdSectionWithoutResize()) { + // takeToThirdSection(); } else { auto newWidth = qMin( parentWidth - 2 * st::infoMinimalLayerMargin, @@ -97,29 +97,31 @@ void LayerWidget::parentResized() { } bool LayerWidget::takeToThirdSection() { - Ui::FocusPersister persister(this); - auto localCopy = _controller; - auto memento = MoveMemento(std::move(_content)); - localCopy->hideSpecialLayer(anim::type::instant); + return false; - // When creating third section in response to the window - // size allowing it to fit without window resize we want - // to save that we didn't extend the window while showing - // the third section, so that when we close it we won't - // shrink the window size. - // - // See https://github.com/telegramdesktop/tdesktop/issues/4091 - Auth().data().setThirdSectionExtendedBy(0); + //Ui::FocusPersister persister(this); + //auto localCopy = _controller; + //auto memento = MoveMemento(std::move(_content)); + //localCopy->hideSpecialLayer(anim::type::instant); - Auth().data().setThirdSectionInfoEnabled(true); - Auth().saveDataDelayed(); - localCopy->showSection( - std::move(memento), - Window::SectionShow( - Window::SectionShow::Way::ClearStack, - anim::type::instant, - anim::activation::background)); - return true; + //// When creating third section in response to the window + //// size allowing it to fit without window resize we want + //// to save that we didn't extend the window while showing + //// the third section, so that when we close it we won't + //// shrink the window size. + //// + //// See https://github.com/telegramdesktop/tdesktop/issues/4091 + //Auth().data().setThirdSectionExtendedBy(0); + + //Auth().data().setThirdSectionInfoEnabled(true); + //Auth().saveDataDelayed(); + //localCopy->showSection( + // std::move(memento), + // Window::SectionShow( + // Window::SectionShow::Way::ClearStack, + // anim::type::instant, + // anim::activation::background)); + //return true; } bool LayerWidget::showSectionInternal( diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index 57ec050f2..fd54ce206 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -302,7 +302,7 @@ void WrapWidget::createTopBar() { _topBar->enableBackButton(); _topBar->backRequest() | rpl::start_with_next([this] { - showBackFromStack(); + _controller->showBackFromStack(); }, _topBar->lifetime()); } else if (wrapValue == Wrap::Side) { auto close = _topBar->addButton( @@ -441,19 +441,18 @@ bool WrapWidget::requireTopBarSearch() const { return false; } -void WrapWidget::showBackFromStack() { - auto params = Window::SectionShow( - Window::SectionShow::Way::Backward); +bool WrapWidget::showBackFromStackInternal( + const Window::SectionShow ¶ms) { if (hasStackHistory()) { auto last = std::move(_historyStack.back()); _historyStack.pop_back(); showNewContent( last.section.get(), - params); + params.withWay(Window::SectionShow::Way::Backward)); //_anotherTabMemento = std::move(last.anotherTab); - } else if (wrap() != Wrap::Layer) { - _controller->window()->showBackFromStack(params); + return true; } + return (wrap() == Wrap::Layer); } not_null WrapWidget::topWidget() const { @@ -718,7 +717,7 @@ bool WrapWidget::returnToFirstStackFrame( && firstSection.type() == memento->section().type() && firstSection.type() == Section::Type::Profile) { _historyStack.resize(1); - showBackFromStack(); + _controller->showBackFromStack(); return true; } return false; @@ -809,7 +808,7 @@ void WrapWidget::resizeEvent(QResizeEvent *e) { void WrapWidget::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Escape) { if (hasStackHistory() || wrap() != Wrap::Layer) { - showBackFromStack(); + _controller->showBackFromStack(); return; } } @@ -840,7 +839,7 @@ object_ptr WrapWidget::createTopBarSurrogate( auto result = object_ptr(parent); result->addClickHandler([weak = make_weak(this)]{ if (weak) { - weak->showBackFromStack(); + weak->_controller->showBackFromStack(); } }); result->setGeometry(_topBar->geometry()); diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index ed7f44c6d..b11f793a0 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -109,6 +109,7 @@ public: bool showInternal( not_null memento, const Window::SectionShow ¶ms) override; + bool showBackFromStackInternal(const Window::SectionShow ¶ms); std::unique_ptr createMemento() override; rpl::producer desiredHeightValue() const override; @@ -154,7 +155,6 @@ private: bool hasStackHistory() const { return !_historyStack.empty(); } - void showBackFromStack(); void showNewContent(not_null memento); void showNewContent( not_null memento, diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h index 51dbc796c..38e906739 100644 --- a/Telegram/SourceFiles/info/media/info_media_buttons.h +++ b/Telegram/SourceFiles/info/media/info_media_buttons.h @@ -91,7 +91,7 @@ inline auto AddCountedButton( inline auto AddButton( Ui::VerticalLayout *parent, - not_null controller, + not_null navigation, not_null peer, PeerData *migrated, Type type, @@ -101,8 +101,8 @@ inline auto AddButton( Profile::SharedMediaCountValue(peer, migrated, type), MediaText(type), tracker)->entity(); - result->addClickHandler([controller, peer, type] { - controller->showSection( + result->addClickHandler([=] { + navigation->showSection( Info::Memento(peer->id, Section(type))); }); return std::move(result); @@ -110,7 +110,7 @@ inline auto AddButton( inline auto AddCommonGroupsButton( Ui::VerticalLayout *parent, - not_null controller, + not_null navigation, not_null user, Ui::MultiSlideTracker &tracker) { auto result = AddCountedButton( @@ -120,8 +120,8 @@ inline auto AddCommonGroupsButton( return lng_profile_common_groups(lt_count, count); }, tracker)->entity(); - result->addClickHandler([controller, user] { - controller->showSection( + result->addClickHandler([=] { + navigation->showSection( Info::Memento(user->id, Section::Type::CommonGroups)); }); return std::move(result); diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp index ab435909d..75c6b1c5b 100644 --- a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp @@ -113,7 +113,7 @@ InnerWidget::InnerWidget( // const style::icon &icon) { // auto result = AddButton( // content, -// _controller->window(), +// _controller, // _controller->peer(), // _controller->migrated(), // type, @@ -128,7 +128,7 @@ InnerWidget::InnerWidget( // const style::icon &icon) { // auto result = AddCommonGroupsButton( // content, -// _controller->window(), +// _controller, // user, // tracker); // object_ptr( diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index a30005744..8908ec166 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -151,7 +151,7 @@ object_ptr InnerWidget::setupSharedMedia( const style::icon &icon) { auto result = Media::AddButton( content, - _controller->window(), + _controller, _peer, _migrated, type, @@ -166,7 +166,7 @@ object_ptr InnerWidget::setupSharedMedia( const style::icon &icon) { auto result = Media::AddCommonGroupsButton( content, - _controller->window(), + _controller, user, tracker); object_ptr( diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp index 94101dc35..10c5717bc 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp @@ -59,7 +59,7 @@ Members::Members( : RpWidget(parent) , _controller(controller) , _peer(peer) -, _listController(CreateMembersController(controller->window(), _peer)) { +, _listController(CreateMembersController(controller, _peer)) { setupHeader(); setupList(); setContent(_list.data()); diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index 0a8f76140..7af15435c 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -45,7 +45,7 @@ class ChatMembersController , public base::has_weak_ptr { public: ChatMembersController( - not_null window, + not_null navigation, not_null chat); void prepare() override; @@ -80,7 +80,7 @@ private: void removeMember(not_null user); Type computeType(not_null user); - not_null _window; + not_null _navigation; not_null _chat; base::Timer _sortByOnlineTimer; @@ -89,10 +89,10 @@ private: }; ChatMembersController::ChatMembersController( - not_null window, + not_null navigation, not_null chat) : PeerListController() -, _window(window) +, _navigation(navigation) , _chat(chat) { _sortByOnlineTimer.setCallback([this] { sortByOnline(); }); } @@ -267,7 +267,7 @@ auto ChatMembersController::computeType( } void ChatMembersController::rowClicked(not_null row) { - _window->showPeerInfo(row->peer()); + _navigation->showPeerInfo(row->peer()); } void ChatMembersController::rowActionClicked( @@ -286,7 +286,7 @@ Ui::PopupMenu *ChatMembersController::rowContextMenu( lang(lng_context_view_profile), [weak = base::make_weak(this), user] { if (weak) { - weak->_window->showPeerInfo(user); + weak->_navigation->showPeerInfo(user); } }); if (canRemoveMember) { @@ -376,17 +376,17 @@ void MemberListRow::paintNameIcon( } std::unique_ptr CreateMembersController( - not_null window, + not_null navigation, not_null peer) { if (auto chat = peer->asChat()) { return std::make_unique( - window, + navigation, chat); } else if (auto channel = peer->asChannel()) { using ChannelMembersController = ::Profile::ParticipantsBoxController; return std::make_unique( - window, + navigation, channel, ChannelMembersController::Role::Profile); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h index 2c1ad5fd6..1b96d50d2 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/peer_list_box.h" namespace Window { -class Controller; +class Navigation; } // namespace Window namespace Info { @@ -74,7 +74,7 @@ private: }; std::unique_ptr CreateMembersController( - not_null window, + not_null navigation, not_null peer); } // namespace Profile diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index e1c338eec..d4087d9de 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2604,10 +2604,14 @@ void MainWidget::showSection( &memento, params)) { return; - } else if (_thirdSection && _thirdSection->showInternal( - &memento, - params)) { - return; + // + // Now third section handles only its own showSection() requests. + // General showSection() should show layer or main_section instead. + // + //} else if (_thirdSection && _thirdSection->showInternal( + // &memento, + // params)) { + // return; } // If the window was not resized, but we've enabled @@ -2762,7 +2766,7 @@ void MainWidget::showNewSection( thirdSectionTop, st::columnMinimalWidthThird, height() - thirdSectionTop); - auto newThirdSection = Adaptive::ThreeColumn() + auto newThirdSection = (Adaptive::ThreeColumn() && params.thirdColumn) ? memento.createWidget( this, _controller, @@ -3522,7 +3526,7 @@ void MainWidget::updateThirdColumnToCurrentPeer( _controller->showSection( std::move(*thirdSectionForCurrentMainSection(peer)), - params); + params.withThirdColumn()); }; auto switchTabbedFast = [&] { saveOldThirdSection(); diff --git a/Telegram/SourceFiles/mtproto/config_loader.cpp b/Telegram/SourceFiles/mtproto/config_loader.cpp index 90062ff58..841015456 100644 --- a/Telegram/SourceFiles/mtproto/config_loader.cpp +++ b/Telegram/SourceFiles/mtproto/config_loader.cpp @@ -33,9 +33,13 @@ constexpr auto kSpecialRequestTimeoutMs = 6000; // 4 seconds timeout for it to w } // namespace -ConfigLoader::ConfigLoader(not_null instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail) : _instance(instance) - , _doneHandler(onDone) - , _failHandler(onFail) { +ConfigLoader::ConfigLoader( + not_null instance, + RPCDoneHandlerPtr onDone, + RPCFailHandlerPtr onFail) +: _instance(instance) +, _doneHandler(onDone) +, _failHandler(onFail) { _enumDCTimer.setCallback([this] { enumerate(); }); _specialEnumTimer.setCallback([this] { sendSpecialRequest(); }); } diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp index f0d3295a7..152bfda3c 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.cpp +++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp @@ -87,6 +87,9 @@ void SpecialConfigRequest::dnsFinished() { if (!_dnsReply) { return; } + if (_dnsReply->error() != QNetworkReply::NoError) { + LOG(("Config Error: Failed to get dns response JSON, error: %1 (%2)").arg(_dnsReply->errorString()).arg(_dnsReply->error())); + } auto result = _dnsReply->readAll(); _dnsReply.release()->deleteLater(); diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index c87964d8b..5d8bfc824 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -45,11 +45,11 @@ constexpr auto kSortByOnlineDelay = TimeMs(1000); } // namespace ParticipantsBoxController::ParticipantsBoxController( - not_null window, + not_null navigation, not_null channel, Role role) : PeerListController(CreateSearchController(channel, role, &_additional)) -, _window(window) +, _navigation(navigation) , _channel(channel) , _role(role) { if (_channel->mgInfo) { @@ -162,11 +162,11 @@ ParticipantsBoxController::CreateSearchController( } void ParticipantsBoxController::Start( - not_null window, + not_null navigation, not_null channel, Role role) { auto controller = std::make_unique( - window, + navigation, channel, role); auto initBox = [role, channel, controller = controller.get()](not_null box) { @@ -582,7 +582,7 @@ void ParticipantsBoxController::rowClicked(not_null row) { } else if (_role == Role::Restricted || _role == Role::Kicked) { showRestricted(user); } else { - _window->showPeerInfo(row->peer()); + _navigation->showPeerInfo(row->peer()); } } @@ -643,7 +643,7 @@ Ui::PopupMenu *ParticipantsBoxController::rowContextMenu( lang(lng_context_view_profile), [weak = base::make_weak(this), user] { if (const auto strong = weak.get()) { - strong->_window->showPeerInfo(user); + strong->_navigation->showPeerInfo(user); } }); if (canEditAdmin(user)) { diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h index 56346036c..cf71eab16 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.h +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "info/profile/info_profile_members_controllers.h" namespace Window { -class Controller; +class Navigation; } // namespace Window namespace Profile { @@ -48,7 +48,7 @@ public: Kicked, }; static void Start( - not_null window, + not_null navigation, not_null channel, Role role); @@ -65,7 +65,7 @@ public: }; ParticipantsBoxController( - not_null window, + not_null navigation, not_null channel, Role role); @@ -142,7 +142,7 @@ private: bool canRestrictUser(not_null user) const; bool canEditAdminByRights(not_null user) const; - not_null _window; + not_null _navigation; not_null _channel; Role _role = Role::Admins; int _offset = 0; diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp index 764553179..a658c6e02 100644 --- a/Telegram/SourceFiles/window/window_controller.cpp +++ b/Telegram/SourceFiles/window/window_controller.cpp @@ -367,24 +367,24 @@ void Controller::showPeerHistory( msgId); } -void Controller::showPeerInfo( +void Navigation::showPeerInfo( PeerId peerId, const SectionShow ¶ms) { - if (Adaptive::ThreeColumn() - && !Auth().data().thirdSectionInfoEnabled()) { - Auth().data().setThirdSectionInfoEnabled(true); - Auth().saveDataDelayed(); - } + //if (Adaptive::ThreeColumn() + // && !Auth().data().thirdSectionInfoEnabled()) { + // Auth().data().setThirdSectionInfoEnabled(true); + // Auth().saveDataDelayed(); + //} showSection(Info::Memento(peerId), params); } -void Controller::showPeerInfo( +void Navigation::showPeerInfo( not_null peer, const SectionShow ¶ms) { showPeerInfo(peer->id, params); } -void Controller::showPeerInfo( +void Navigation::showPeerInfo( not_null history, const SectionShow ¶ms) { showPeerInfo(history->peer->id, params); diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h index 7f36f8e92..bbc41712d 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_controller.h @@ -28,6 +28,8 @@ class MainWidget; namespace Window { class LayerWidget; +class MainWindow; +class SectionMemento; enum class GifPauseReason { Any = 0, @@ -64,17 +66,43 @@ struct SectionShow { SectionShow withWay(Way newWay) const { return SectionShow(newWay, animated, activation); } + SectionShow withThirdColumn() const { + auto copy = *this; + copy.thirdColumn = true; + return copy; + } Way way = Way::Forward; anim::type animated = anim::type::normal; anim::activation activation = anim::activation::normal; + bool thirdColumn = false; }; -class MainWindow; -class SectionMemento; +class Controller; -class Controller { +class Navigation { +public: + virtual void showSection( + SectionMemento &&memento, + const SectionShow ¶ms = SectionShow()) = 0; + virtual void showBackFromStack( + const SectionShow ¶ms = SectionShow()) = 0; + virtual not_null parentController() = 0; + + void showPeerInfo( + PeerId peerId, + const SectionShow ¶ms = SectionShow()); + void showPeerInfo( + not_null peer, + const SectionShow ¶ms = SectionShow()); + void showPeerInfo( + not_null history, + const SectionShow ¶ms = SectionShow()); + +}; + +class Controller : public Navigation { public: Controller(not_null window) : _window(window) { } @@ -126,9 +154,9 @@ public: void showSection( SectionMemento &&memento, - const SectionShow ¶ms = SectionShow()); + const SectionShow ¶ms = SectionShow()) override; void showBackFromStack( - const SectionShow ¶ms = SectionShow()); + const SectionShow ¶ms = SectionShow()) override; void showPeerHistory( PeerId peerId, @@ -143,16 +171,6 @@ public: const SectionShow ¶ms = SectionShow::Way::ClearStack, MsgId msgId = ShowAtUnreadMsgId); - void showPeerInfo( - PeerId peerId, - const SectionShow ¶ms = SectionShow()); - void showPeerInfo( - not_null peer, - const SectionShow ¶ms = SectionShow()); - void showPeerInfo( - not_null history, - const SectionShow ¶ms = SectionShow()); - void clearSectionStack( const SectionShow ¶ms = SectionShow::Way::ClearStack) { showPeerHistory( @@ -186,6 +204,10 @@ public: return _dialogsListDisplayForced; } + not_null parentController() override { + return this; + } + private: int minimalThreeColumnWidth() const; not_null chats() const;