procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show third column only when explicitly requested. 

This allows you to show info in layer from mention links.
This commit is contained in:
John Preston 2017-12-04 11:33:33 +04:00
parent 629c216a7f
commit e1c68892d4
23 changed files with 184 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp
View File

@ -101,9 +101,7 @@ bool HasRecentActions(not_null<ChannelData*> channel) {
void ShowRecentActions( void ShowRecentActions(
not_null<Window::Controller*> controller, not_null<Window::Controller*> controller,
not_null<ChannelData*> channel) { not_null<ChannelData*> channel) {
controller->showSection( controller->showSection(AdminLog::SectionMemento(channel));
AdminLog::SectionMemento(channel),
Window::SectionShow());
} }

24
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
View File

@ -28,16 +28,26 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace Dialogs { namespace Dialogs {
void ShowSearchFromBox( void ShowSearchFromBox(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<PeerData*> peer, not_null<PeerData*> peer,
base::lambda<void(not_null<UserData*>)> callback, base::lambda<void(not_null<UserData*>)> callback,
base::lambda<void()> closedCallback) { base::lambda<void()> closedCallback) {
auto createController = [window, peer, callback = std::move(callback)]() -> std::unique_ptr<PeerListController> { auto createController = [
navigation,
peer,
callback = std::move(callback)
]() -> std::unique_ptr<PeerListController> {
if (peer) { if (peer) {
if (auto chat = peer->asChat()) { if (auto chat = peer->asChat()) {
return std::make_unique<Dialogs::ChatSearchFromController>(window, chat, std::move(callback)); return std::make_unique<Dialogs::ChatSearchFromController>(
navigation,
chat,
std::move(callback));
} else if (auto group = peer->asMegagroup()) { } else if (auto group = peer->asMegagroup()) {
return std::make_unique<Dialogs::ChannelSearchFromController>(window, group, std::move(callback)); return std::make_unique<Dialogs::ChannelSearchFromController>(
navigation,
group,
std::move(callback));
} }
} }
return nullptr; return nullptr;
@ -52,7 +62,7 @@ void ShowSearchFromBox(
} }
ChatSearchFromController::ChatSearchFromController( ChatSearchFromController::ChatSearchFromController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChatData*> chat, not_null<ChatData*> chat,
base::lambda<void(not_null<UserData*>)> callback) base::lambda<void(not_null<UserData*>)> callback)
: PeerListController() : PeerListController()
@ -123,11 +133,11 @@ void ChatSearchFromController::appendRow(not_null<UserData*> user) {
} }
ChannelSearchFromController::ChannelSearchFromController( ChannelSearchFromController::ChannelSearchFromController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
base::lambda<void(not_null<UserData*>)> callback) base::lambda<void(not_null<UserData*>)> callback)
: ParticipantsBoxController( : ParticipantsBoxController(
window, navigation,
channel, channel,
ParticipantsBoxController::Role::Members) ParticipantsBoxController::Role::Members)
, _callback(std::move(callback)) { , _callback(std::move(callback)) {

6
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
View File

@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace Dialogs { namespace Dialogs {
void ShowSearchFromBox( void ShowSearchFromBox(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<PeerData*> peer, not_null<PeerData*> peer,
base::lambda<void(not_null<UserData*>)> callback, base::lambda<void(not_null<UserData*>)> callback,
base::lambda<void()> closedCallback); base::lambda<void()> closedCallback);
@ -34,7 +34,7 @@ void ShowSearchFromBox(
class ChatSearchFromController : public PeerListController, protected base::Subscriber { class ChatSearchFromController : public PeerListController, protected base::Subscriber {
public: public:
ChatSearchFromController( ChatSearchFromController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChatData*> chat, not_null<ChatData*> chat,
base::lambda<void(not_null<UserData*>)> callback); base::lambda<void(not_null<UserData*>)> callback);
@ -54,7 +54,7 @@ private:
class ChannelSearchFromController : public Profile::ParticipantsBoxController { class ChannelSearchFromController : public Profile::ParticipantsBoxController {
public: public:
ChannelSearchFromController( ChannelSearchFromController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
base::lambda<void(not_null<UserData*>)> callback); base::lambda<void(not_null<UserData*>)> callback);

4
Telegram/SourceFiles/history/history_top_bar_widget.cpp
View File

@ -242,7 +242,9 @@ void HistoryTopBarWidget::toggleInfoSection() {
Auth().data().setThirdSectionInfoEnabled(true); Auth().data().setThirdSectionInfoEnabled(true);
Auth().saveDataDelayed(); Auth().saveDataDelayed();
if (Adaptive::ThreeColumn()) { if (Adaptive::ThreeColumn()) {
_controller->showSection(Info::Memento(_historyPeer->id)); _controller->showSection(
Info::Memento(_historyPeer->id),
Window::SectionShow().withThirdColumn());
} else { } else {
_controller->resizeForThirdSection(); _controller->resizeForThirdSection();
_controller->updateColumnLayout(); _controller->updateColumnLayout();

6
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -3887,7 +3887,7 @@ void HistoryWidget::pushTabbedSelectorToThirdSection(
return; return;
} else if (!_canSendMessages) { } else if (!_canSendMessages) {
Auth().data().setTabbedReplacedWithInfo(true); Auth().data().setTabbedReplacedWithInfo(true);
controller()->showPeerInfo(_peer, params); controller()->showPeerInfo(_peer, params.withThirdColumn());
return; return;
} }
Auth().data().setTabbedReplacedWithInfo(false); Auth().data().setTabbedReplacedWithInfo(false);
@ -3903,7 +3903,7 @@ void HistoryWidget::pushTabbedSelectorToThirdSection(
returnTabbedSelector(std::move(selector)); returnTabbedSelector(std::move(selector));
})); }));
controller()->resizeForThirdSection(); controller()->resizeForThirdSection();
controller()->showSection(std::move(memento), params); controller()->showSection(std::move(memento), params.withThirdColumn());
destroyingPanel.destroy(); destroyingPanel.destroy();
} }
@ -3912,7 +3912,7 @@ void HistoryWidget::pushInfoToThirdSection(
if (!_peer) { if (!_peer) {
return; return;
} }
controller()->showPeerInfo(_peer, params); controller()->showPeerInfo(_peer, params.withThirdColumn());
} }
void HistoryWidget::toggleTabbedSelectorMode() { void HistoryWidget::toggleTabbedSelectorMode() {

14
Telegram/SourceFiles/info/info_controller.cpp
View File

@ -157,6 +157,20 @@ void Controller::saveSearchState(not_null<ContentMemento*> memento) {
} }
} }
void Controller::showSection(
Window::SectionMemento &&memento,
const Window::SectionShow &params) {
if (!_widget->showInternal(&memento, params)) {
_window->showSection(std::move(memento), params);
}
}
void Controller::showBackFromStack(const Window::SectionShow &params) {
if (!_widget->showBackFromStackInternal(params)) {
_window->showBackFromStack(params);
}
}
auto Controller::produceSearchQuery( auto Controller::produceSearchQuery(
const QString &query) const -> SearchQuery { const QString &query) const -> SearchQuery {
auto result = SearchQuery(); auto result = SearchQuery();

16
Telegram/SourceFiles/info/info_controller.h
View File

@ -22,15 +22,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include <rpl/variable.h> #include <rpl/variable.h>
#include "data/data_search_controller.h" #include "data/data_search_controller.h"
#include "window/window_controller.h"
namespace Ui { namespace Ui {
class SearchFieldController; class SearchFieldController;
} // namespace Ui } // namespace Ui
namespace Window {
class Controller;
} // namespace Window
namespace Info { namespace Info {
enum class Wrap; enum class Wrap;
@ -70,7 +67,7 @@ private:
}; };
class Controller { class Controller : public Window::Navigation {
public: public:
Controller( Controller(
not_null<WrapWidget*> widget, not_null<WrapWidget*> widget,
@ -118,6 +115,15 @@ public:
void saveSearchState(not_null<ContentMemento*> memento); void saveSearchState(not_null<ContentMemento*> memento);
void showSection(
Window::SectionMemento &&memento,
const Window::SectionShow &params = Window::SectionShow()) override;
void showBackFromStack(
const Window::SectionShow &params = Window::SectionShow()) override;
not_null<Window::Controller*> parentController() override {
return _window;
}
rpl::lifetime &lifetime() { rpl::lifetime &lifetime() {
return _lifetime; return _lifetime;
} }

48
Telegram/SourceFiles/info/info_layer_widget.cpp
View File

@ -86,8 +86,8 @@ void LayerWidget::parentResized() {
Window::SectionShow::Way::Forward, Window::SectionShow::Way::Forward,
anim::type::instant, anim::type::instant,
anim::activation::background)); anim::activation::background));
} else if (_controller->canShowThirdSectionWithoutResize()) { //} else if (_controller->canShowThirdSectionWithoutResize()) {
takeToThirdSection(); // takeToThirdSection();
} else { } else {
auto newWidth = qMin( auto newWidth = qMin(
parentWidth - 2 * st::infoMinimalLayerMargin, parentWidth - 2 * st::infoMinimalLayerMargin,
@ -97,29 +97,31 @@ void LayerWidget::parentResized() {
} }
bool LayerWidget::takeToThirdSection() { bool LayerWidget::takeToThirdSection() {
Ui::FocusPersister persister(this); return false;
auto localCopy = _controller;
auto memento = MoveMemento(std::move(_content));
localCopy->hideSpecialLayer(anim::type::instant);
// When creating third section in response to the window //Ui::FocusPersister persister(this);
// size allowing it to fit without window resize we want //auto localCopy = _controller;
// to save that we didn't extend the window while showing //auto memento = MoveMemento(std::move(_content));
// the third section, so that when we close it we won't //localCopy->hideSpecialLayer(anim::type::instant);
// shrink the window size.
//
// See https://github.com/telegramdesktop/tdesktop/issues/4091
Auth().data().setThirdSectionExtendedBy(0);
Auth().data().setThirdSectionInfoEnabled(true); //// When creating third section in response to the window
Auth().saveDataDelayed(); //// size allowing it to fit without window resize we want
localCopy->showSection( //// to save that we didn't extend the window while showing
std::move(memento), //// the third section, so that when we close it we won't
Window::SectionShow( //// shrink the window size.
Window::SectionShow::Way::ClearStack, ////
anim::type::instant, //// See https://github.com/telegramdesktop/tdesktop/issues/4091
anim::activation::background)); //Auth().data().setThirdSectionExtendedBy(0);
return true;
//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( bool LayerWidget::showSectionInternal(

19
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@ -302,7 +302,7 @@ void WrapWidget::createTopBar() {
_topBar->enableBackButton(); _topBar->enableBackButton();
_topBar->backRequest() _topBar->backRequest()
| rpl::start_with_next([this] { | rpl::start_with_next([this] {
showBackFromStack(); _controller->showBackFromStack();
}, _topBar->lifetime()); }, _topBar->lifetime());
} else if (wrapValue == Wrap::Side) { } else if (wrapValue == Wrap::Side) {
auto close = _topBar->addButton( auto close = _topBar->addButton(
@ -441,19 +441,18 @@ bool WrapWidget::requireTopBarSearch() const {
return false; return false;
} }
void WrapWidget::showBackFromStack() { bool WrapWidget::showBackFromStackInternal(
auto params = Window::SectionShow( const Window::SectionShow &params) {
Window::SectionShow::Way::Backward);
if (hasStackHistory()) { if (hasStackHistory()) {
auto last = std::move(_historyStack.back()); auto last = std::move(_historyStack.back());
_historyStack.pop_back(); _historyStack.pop_back();
showNewContent( showNewContent(
last.section.get(), last.section.get(),
params); params.withWay(Window::SectionShow::Way::Backward));
//_anotherTabMemento = std::move(last.anotherTab); //_anotherTabMemento = std::move(last.anotherTab);
} else if (wrap() != Wrap::Layer) { return true;
_controller->window()->showBackFromStack(params);
} }
return (wrap() == Wrap::Layer);
} }
not_null<Ui::RpWidget*> WrapWidget::topWidget() const { not_null<Ui::RpWidget*> WrapWidget::topWidget() const {
@ -718,7 +717,7 @@ bool WrapWidget::returnToFirstStackFrame(
&& firstSection.type() == memento->section().type() && firstSection.type() == memento->section().type()
&& firstSection.type() == Section::Type::Profile) { && firstSection.type() == Section::Type::Profile) {
_historyStack.resize(1); _historyStack.resize(1);
showBackFromStack(); _controller->showBackFromStack();
return true; return true;
} }
return false; return false;
@ -809,7 +808,7 @@ void WrapWidget::resizeEvent(QResizeEvent *e) {
void WrapWidget::keyPressEvent(QKeyEvent *e) { void WrapWidget::keyPressEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Escape) { if (e->key() == Qt::Key_Escape) {
if (hasStackHistory() || wrap() != Wrap::Layer) { if (hasStackHistory() || wrap() != Wrap::Layer) {
showBackFromStack(); _controller->showBackFromStack();
return; return;
} }
} }
@ -840,7 +839,7 @@ object_ptr<Ui::RpWidget> WrapWidget::createTopBarSurrogate(
auto result = object_ptr<Ui::AbstractButton>(parent); auto result = object_ptr<Ui::AbstractButton>(parent);
result->addClickHandler([weak = make_weak(this)]{ result->addClickHandler([weak = make_weak(this)]{
if (weak) { if (weak) {
weak->showBackFromStack(); weak->_controller->showBackFromStack();
} }
}); });
result->setGeometry(_topBar->geometry()); result->setGeometry(_topBar->geometry());

2
Telegram/SourceFiles/info/info_wrap_widget.h
View File

@ -109,6 +109,7 @@ public:
bool showInternal( bool showInternal(
not_null<Window::SectionMemento*> memento, not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override; const Window::SectionShow &params) override;
bool showBackFromStackInternal(const Window::SectionShow &params);
std::unique_ptr<Window::SectionMemento> createMemento() override; std::unique_ptr<Window::SectionMemento> createMemento() override;
rpl::producer<int> desiredHeightValue() const override; rpl::producer<int> desiredHeightValue() const override;
@ -154,7 +155,6 @@ private:
bool hasStackHistory() const { bool hasStackHistory() const {
return !_historyStack.empty(); return !_historyStack.empty();
} }
void showBackFromStack();
void showNewContent(not_null<ContentMemento*> memento); void showNewContent(not_null<ContentMemento*> memento);
void showNewContent( void showNewContent(
not_null<ContentMemento*> memento, not_null<ContentMemento*> memento,

12
Telegram/SourceFiles/info/media/info_media_buttons.h
View File

@ -91,7 +91,7 @@ inline auto AddCountedButton(
inline auto AddButton( inline auto AddButton(
Ui::VerticalLayout *parent, Ui::VerticalLayout *parent,
not_null<Window::Controller*> controller, not_null<Window::Navigation*> navigation,
not_null<PeerData*> peer, not_null<PeerData*> peer,
PeerData *migrated, PeerData *migrated,
Type type, Type type,
@ -101,8 +101,8 @@ inline auto AddButton(
Profile::SharedMediaCountValue(peer, migrated, type), Profile::SharedMediaCountValue(peer, migrated, type),
MediaText(type), MediaText(type),
tracker)->entity(); tracker)->entity();
result->addClickHandler([controller, peer, type] { result->addClickHandler([=] {
controller->showSection( navigation->showSection(
Info::Memento(peer->id, Section(type))); Info::Memento(peer->id, Section(type)));
}); });
return std::move(result); return std::move(result);
@ -110,7 +110,7 @@ inline auto AddButton(
inline auto AddCommonGroupsButton( inline auto AddCommonGroupsButton(
Ui::VerticalLayout *parent, Ui::VerticalLayout *parent,
not_null<Window::Controller*> controller, not_null<Window::Navigation*> navigation,
not_null<UserData*> user, not_null<UserData*> user,
Ui::MultiSlideTracker &tracker) { Ui::MultiSlideTracker &tracker) {
auto result = AddCountedButton( auto result = AddCountedButton(
@ -120,8 +120,8 @@ inline auto AddCommonGroupsButton(
return lng_profile_common_groups(lt_count, count); return lng_profile_common_groups(lt_count, count);
}, },
tracker)->entity(); tracker)->entity();
result->addClickHandler([controller, user] { result->addClickHandler([=] {
controller->showSection( navigation->showSection(
Info::Memento(user->id, Section::Type::CommonGroups)); Info::Memento(user->id, Section::Type::CommonGroups));
}); });
return std::move(result); return std::move(result);

4
Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
View File

@ -113,7 +113,7 @@ InnerWidget::InnerWidget(
// const style::icon &icon) { // const style::icon &icon) {
// auto result = AddButton( // auto result = AddButton(
// content, // content,
// _controller->window(), // _controller,
// _controller->peer(), // _controller->peer(),
// _controller->migrated(), // _controller->migrated(),
// type, // type,
@ -128,7 +128,7 @@ InnerWidget::InnerWidget(
// const style::icon &icon) { // const style::icon &icon) {
// auto result = AddCommonGroupsButton( // auto result = AddCommonGroupsButton(
// content, // content,
// _controller->window(), // _controller,
// user, // user,
// tracker); // tracker);
// object_ptr<Profile::FloatingIcon>( // object_ptr<Profile::FloatingIcon>(

4
Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
View File

@ -151,7 +151,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
const style::icon &icon) { const style::icon &icon) {
auto result = Media::AddButton( auto result = Media::AddButton(
content, content,
_controller->window(), _controller,
_peer, _peer,
_migrated, _migrated,
type, type,
@ -166,7 +166,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
const style::icon &icon) { const style::icon &icon) {
auto result = Media::AddCommonGroupsButton( auto result = Media::AddCommonGroupsButton(
content, content,
_controller->window(), _controller,
user, user,
tracker); tracker);
object_ptr<Profile::FloatingIcon>( object_ptr<Profile::FloatingIcon>(

2
Telegram/SourceFiles/info/profile/info_profile_members.cpp
View File

@ -59,7 +59,7 @@ Members::Members(
: RpWidget(parent) : RpWidget(parent)
, _controller(controller) , _controller(controller)
, _peer(peer) , _peer(peer)
, _listController(CreateMembersController(controller->window(), _peer)) { , _listController(CreateMembersController(controller, _peer)) {
setupHeader(); setupHeader();
setupList(); setupList();
setContent(_list.data()); setContent(_list.data());

18
Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp
View File

@ -45,7 +45,7 @@ class ChatMembersController
, public base::has_weak_ptr { , public base::has_weak_ptr {
public: public:
ChatMembersController( ChatMembersController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChatData*> chat); not_null<ChatData*> chat);
void prepare() override; void prepare() override;
@ -80,7 +80,7 @@ private:
void removeMember(not_null<UserData*> user); void removeMember(not_null<UserData*> user);
Type computeType(not_null<UserData*> user); Type computeType(not_null<UserData*> user);
not_null<Window::Controller*> _window; not_null<Window::Navigation*> _navigation;
not_null<ChatData*> _chat; not_null<ChatData*> _chat;
base::Timer _sortByOnlineTimer; base::Timer _sortByOnlineTimer;
@ -89,10 +89,10 @@ private:
}; };
ChatMembersController::ChatMembersController( ChatMembersController::ChatMembersController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChatData*> chat) not_null<ChatData*> chat)
: PeerListController() : PeerListController()
, _window(window) , _navigation(navigation)
, _chat(chat) { , _chat(chat) {
_sortByOnlineTimer.setCallback([this] { sortByOnline(); }); _sortByOnlineTimer.setCallback([this] { sortByOnline(); });
} }
@ -267,7 +267,7 @@ auto ChatMembersController::computeType(
} }
void ChatMembersController::rowClicked(not_null<PeerListRow*> row) { void ChatMembersController::rowClicked(not_null<PeerListRow*> row) {
_window->showPeerInfo(row->peer()); _navigation->showPeerInfo(row->peer());
} }
void ChatMembersController::rowActionClicked( void ChatMembersController::rowActionClicked(
@ -286,7 +286,7 @@ Ui::PopupMenu *ChatMembersController::rowContextMenu(
lang(lng_context_view_profile), lang(lng_context_view_profile),
[weak = base::make_weak(this), user] { [weak = base::make_weak(this), user] {
if (weak) { if (weak) {
weak->_window->showPeerInfo(user); weak->_navigation->showPeerInfo(user);
} }
}); });
if (canRemoveMember) { if (canRemoveMember) {
@ -376,17 +376,17 @@ void MemberListRow::paintNameIcon(
} }
std::unique_ptr<PeerListController> CreateMembersController( std::unique_ptr<PeerListController> CreateMembersController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<PeerData*> peer) { not_null<PeerData*> peer) {
if (auto chat = peer->asChat()) { if (auto chat = peer->asChat()) {
return std::make_unique<ChatMembersController>( return std::make_unique<ChatMembersController>(
window, navigation,
chat); chat);
} else if (auto channel = peer->asChannel()) { } else if (auto channel = peer->asChannel()) {
using ChannelMembersController using ChannelMembersController
= ::Profile::ParticipantsBoxController; = ::Profile::ParticipantsBoxController;
return std::make_unique<ChannelMembersController>( return std::make_unique<ChannelMembersController>(
window, navigation,
channel, channel,
ChannelMembersController::Role::Profile); ChannelMembersController::Role::Profile);
} }

4
Telegram/SourceFiles/info/profile/info_profile_members_controllers.h
View File

@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "boxes/peer_list_box.h" #include "boxes/peer_list_box.h"
namespace Window { namespace Window {
class Controller; class Navigation;
} // namespace Window } // namespace Window
namespace Info { namespace Info {
@ -74,7 +74,7 @@ private:
}; };
std::unique_ptr<PeerListController> CreateMembersController( std::unique_ptr<PeerListController> CreateMembersController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<PeerData*> peer); not_null<PeerData*> peer);
} // namespace Profile } // namespace Profile

16
Telegram/SourceFiles/mainwidget.cpp
View File

@ -2604,10 +2604,14 @@ void MainWidget::showSection(
&memento, &memento,
params)) { params)) {
return; return;
} else if (_thirdSection && _thirdSection->showInternal( //
&memento, // Now third section handles only its own showSection() requests.
params)) { // General showSection() should show layer or main_section instead.
return; //
//} else if (_thirdSection && _thirdSection->showInternal(
// &memento,
// params)) {
// return;
} }
// If the window was not resized, but we've enabled // If the window was not resized, but we've enabled
@ -2762,7 +2766,7 @@ void MainWidget::showNewSection(
thirdSectionTop, thirdSectionTop,
st::columnMinimalWidthThird, st::columnMinimalWidthThird,
height() - thirdSectionTop); height() - thirdSectionTop);
auto newThirdSection = Adaptive::ThreeColumn() auto newThirdSection = (Adaptive::ThreeColumn() && params.thirdColumn)
? memento.createWidget( ? memento.createWidget(
this, this,
_controller, _controller,
@ -3522,7 +3526,7 @@ void MainWidget::updateThirdColumnToCurrentPeer(
_controller->showSection( _controller->showSection(
std::move(*thirdSectionForCurrentMainSection(peer)), std::move(*thirdSectionForCurrentMainSection(peer)),
params); params.withThirdColumn());
}; };
auto switchTabbedFast = [&] { auto switchTabbedFast = [&] {
saveOldThirdSection(); saveOldThirdSection();

10
Telegram/SourceFiles/mtproto/config_loader.cpp
View File

@ -33,9 +33,13 @@ constexpr auto kSpecialRequestTimeoutMs = 6000; // 4 seconds timeout for it to w
} // namespace } // namespace
ConfigLoader::ConfigLoader(not_null<Instance*> instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail) : _instance(instance) ConfigLoader::ConfigLoader(
, _doneHandler(onDone) not_null<Instance*> instance,
, _failHandler(onFail) { RPCDoneHandlerPtr onDone,
RPCFailHandlerPtr onFail)
: _instance(instance)
, _doneHandler(onDone)
, _failHandler(onFail) {
_enumDCTimer.setCallback([this] { enumerate(); }); _enumDCTimer.setCallback([this] { enumerate(); });
_specialEnumTimer.setCallback([this] { sendSpecialRequest(); }); _specialEnumTimer.setCallback([this] { sendSpecialRequest(); });
} }

3
Telegram/SourceFiles/mtproto/special_config_request.cpp
View File

@ -87,6 +87,9 @@ void SpecialConfigRequest::dnsFinished() {
if (!_dnsReply) { if (!_dnsReply) {
return; 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(); auto result = _dnsReply->readAll();
_dnsReply.release()->deleteLater(); _dnsReply.release()->deleteLater();

12
Telegram/SourceFiles/profile/profile_channel_controllers.cpp
View File

@ -45,11 +45,11 @@ constexpr auto kSortByOnlineDelay = TimeMs(1000);
} // namespace } // namespace
ParticipantsBoxController::ParticipantsBoxController( ParticipantsBoxController::ParticipantsBoxController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
Role role) Role role)
: PeerListController(CreateSearchController(channel, role, &_additional)) : PeerListController(CreateSearchController(channel, role, &_additional))
, _window(window) , _navigation(navigation)
, _channel(channel) , _channel(channel)
, _role(role) { , _role(role) {
if (_channel->mgInfo) { if (_channel->mgInfo) {
@ -162,11 +162,11 @@ ParticipantsBoxController::CreateSearchController(
} }
void ParticipantsBoxController::Start( void ParticipantsBoxController::Start(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
Role role) { Role role) {
auto controller = std::make_unique<ParticipantsBoxController>( auto controller = std::make_unique<ParticipantsBoxController>(
window, navigation,
channel, channel,
role); role);
auto initBox = [role, channel, controller = controller.get()](not_null<PeerListBox*> box) { auto initBox = [role, channel, controller = controller.get()](not_null<PeerListBox*> box) {
@ -582,7 +582,7 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
} else if (_role == Role::Restricted || _role == Role::Kicked) { } else if (_role == Role::Restricted || _role == Role::Kicked) {
showRestricted(user); showRestricted(user);
} else { } else {
_window->showPeerInfo(row->peer()); _navigation->showPeerInfo(row->peer());
} }
} }
@ -643,7 +643,7 @@ Ui::PopupMenu *ParticipantsBoxController::rowContextMenu(
lang(lng_context_view_profile), lang(lng_context_view_profile),
[weak = base::make_weak(this), user] { [weak = base::make_weak(this), user] {
if (const auto strong = weak.get()) { if (const auto strong = weak.get()) {
strong->_window->showPeerInfo(user); strong->_navigation->showPeerInfo(user);
} }
}); });
if (canEditAdmin(user)) { if (canEditAdmin(user)) {

8
Telegram/SourceFiles/profile/profile_channel_controllers.h
View File

@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "info/profile/info_profile_members_controllers.h" #include "info/profile/info_profile_members_controllers.h"
namespace Window { namespace Window {
class Controller; class Navigation;
} // namespace Window } // namespace Window
namespace Profile { namespace Profile {
@ -48,7 +48,7 @@ public:
Kicked, Kicked,
}; };
static void Start( static void Start(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
Role role); Role role);
@ -65,7 +65,7 @@ public:
}; };
ParticipantsBoxController( ParticipantsBoxController(
not_null<Window::Controller*> window, not_null<Window::Navigation*> navigation,
not_null<ChannelData*> channel, not_null<ChannelData*> channel,
Role role); Role role);
@ -142,7 +142,7 @@ private:
bool canRestrictUser(not_null<UserData*> user) const; bool canRestrictUser(not_null<UserData*> user) const;
bool canEditAdminByRights(not_null<UserData*> user) const; bool canEditAdminByRights(not_null<UserData*> user) const;
not_null<Window::Controller*> _window; not_null<Window::Navigation*> _navigation;
not_null<ChannelData*> _channel; not_null<ChannelData*> _channel;
Role _role = Role::Admins; Role _role = Role::Admins;
int _offset = 0; int _offset = 0;

16
Telegram/SourceFiles/window/window_controller.cpp
View File

@ -367,24 +367,24 @@ void Controller::showPeerHistory(
msgId); msgId);
} }
void Controller::showPeerInfo( void Navigation::showPeerInfo(
PeerId peerId, PeerId peerId,
const SectionShow &params) { const SectionShow &params) {
if (Adaptive::ThreeColumn() //if (Adaptive::ThreeColumn()
&& !Auth().data().thirdSectionInfoEnabled()) { // && !Auth().data().thirdSectionInfoEnabled()) {
Auth().data().setThirdSectionInfoEnabled(true); // Auth().data().setThirdSectionInfoEnabled(true);
Auth().saveDataDelayed(); // Auth().saveDataDelayed();
} //}
showSection(Info::Memento(peerId), params); showSection(Info::Memento(peerId), params);
} }
void Controller::showPeerInfo( void Navigation::showPeerInfo(
not_null<PeerData*> peer, not_null<PeerData*> peer,
const SectionShow &params) { const SectionShow &params) {
showPeerInfo(peer->id, params); showPeerInfo(peer->id, params);
} }
void Controller::showPeerInfo( void Navigation::showPeerInfo(
not_null<History*> history, not_null<History*> history,
const SectionShow &params) { const SectionShow &params) {
showPeerInfo(history->peer->id, params); showPeerInfo(history->peer->id, params);

52
Telegram/SourceFiles/window/window_controller.h
View File

@ -28,6 +28,8 @@ class MainWidget;
namespace Window { namespace Window {
class LayerWidget; class LayerWidget;
class MainWindow;
class SectionMemento;
enum class GifPauseReason { enum class GifPauseReason {
Any = 0, Any = 0,
@ -64,17 +66,43 @@ struct SectionShow {
SectionShow withWay(Way newWay) const { SectionShow withWay(Way newWay) const {
return SectionShow(newWay, animated, activation); return SectionShow(newWay, animated, activation);
} }
SectionShow withThirdColumn() const {
auto copy = *this;
copy.thirdColumn = true;
return copy;
}
Way way = Way::Forward; Way way = Way::Forward;
anim::type animated = anim::type::normal; anim::type animated = anim::type::normal;
anim::activation activation = anim::activation::normal; anim::activation activation = anim::activation::normal;
bool thirdColumn = false;
}; };
class MainWindow; class Controller;
class SectionMemento;
class Controller { class Navigation {
public:
virtual void showSection(
SectionMemento &&memento,
const SectionShow &params = SectionShow()) = 0;
virtual void showBackFromStack(
const SectionShow &params = SectionShow()) = 0;
virtual not_null<Controller*> parentController() = 0;
void showPeerInfo(
PeerId peerId,
const SectionShow &params = SectionShow());
void showPeerInfo(
not_null<PeerData*> peer,
const SectionShow &params = SectionShow());
void showPeerInfo(
not_null<History*> history,
const SectionShow &params = SectionShow());
};
class Controller : public Navigation {
public: public:
Controller(not_null<MainWindow*> window) : _window(window) { Controller(not_null<MainWindow*> window) : _window(window) {
} }
@ -126,9 +154,9 @@ public:
void showSection( void showSection(
SectionMemento &&memento, SectionMemento &&memento,
const SectionShow &params = SectionShow()); const SectionShow &params = SectionShow()) override;
void showBackFromStack( void showBackFromStack(
const SectionShow &params = SectionShow()); const SectionShow &params = SectionShow()) override;
void showPeerHistory( void showPeerHistory(
PeerId peerId, PeerId peerId,
@ -143,16 +171,6 @@ public:
const SectionShow &params = SectionShow::Way::ClearStack, const SectionShow &params = SectionShow::Way::ClearStack,
MsgId msgId = ShowAtUnreadMsgId); MsgId msgId = ShowAtUnreadMsgId);
void showPeerInfo(
PeerId peerId,
const SectionShow &params = SectionShow());
void showPeerInfo(
not_null<PeerData*> peer,
const SectionShow &params = SectionShow());
void showPeerInfo(
not_null<History*> history,
const SectionShow &params = SectionShow());
void clearSectionStack( void clearSectionStack(
const SectionShow &params = SectionShow::Way::ClearStack) { const SectionShow &params = SectionShow::Way::ClearStack) {
showPeerHistory( showPeerHistory(
@ -186,6 +204,10 @@ public:
return _dialogsListDisplayForced; return _dialogsListDisplayForced;
} }
not_null<Controller*> parentController() override {
return this;
}
private: private:
int minimalThreeColumnWidth() const; int minimalThreeColumnWidth() const;
not_null<MainWidget*> chats() const; not_null<MainWidget*> chats() const;