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

Use internal section stack in Info::WrapWidget.

This commit is contained in:
John Preston 2017-10-03 14:05:58 +01:00
parent 525cde3498
commit 93c15e5ee6
63 changed files with 736 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/calls/calls_box_controller.cpp
View File

@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/effects/ripple_animation.h"
#include "calls/calls_instance.h"
#include "history/history_media_types.h"
#include "mainwidget.h"
namespace Calls {
namespace {
@ -253,7 +254,9 @@ void BoxController::refreshAbout() {
void BoxController::rowClicked(not_null<PeerListRow*> row) {
auto itemsRow = static_cast<Row*>(row.get());
auto itemId = itemsRow->maxItemId();
Ui::showPeerHistoryAsync(row->peer()->id, itemId);
InvokeQueued(App::main(), [peerId = row->peer()->id, itemId] {
Ui::showPeerHistory(peerId, itemId);
});
}
void BoxController::rowActionClicked(not_null<PeerListRow*> row) {

3
Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
View File

@ -107,7 +107,8 @@ QPointer<TabbedSelector> TabbedSection::getSelector() const {
return _selector.data();
}
bool TabbedSection::showInternal(
not_null<Window::SectionMemento*> memento) {
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
return false;
}

3
Telegram/SourceFiles/chat_helpers/tabbed_section.h
View File

@ -70,7 +70,8 @@ public:
QPointer<TabbedSelector> getSelector() const;
bool showInternal(
not_null<Window::SectionMemento*> memento) override;
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
bool forceAnimateBack() const override {
return true;
}

6
Telegram/SourceFiles/data/data_peer.cpp
View File

@ -31,6 +31,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "styles/style_history.h"
#include "auth_session.h"
#include "messenger.h"
#include "mainwindow.h"
#include "window/window_controller.h"
namespace {
@ -252,7 +254,9 @@ void PeerClickHandler::onClick(Qt::MouseButton button) const {
if (!_peer->asChannel()->isPublic() && !_peer->asChannel()->amIn()) {
Ui::show(Box<InformBox>(lang((_peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
} else {
Ui::showPeerHistory(_peer, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
App::wnd()->controller()->showPeerHistory(
_peer,
Window::SectionShow::Way::Forward);
}
} else {
Ui::showPeerProfile(_peer);

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

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

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

@ -25,11 +25,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace Dialogs {
void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData*>)> callback, base::lambda<void()> closedCallback);
void ShowSearchFromBox(
not_null<Window::Controller*> window,
not_null<PeerData*> peer,
base::lambda<void(not_null<UserData*>)> callback,
base::lambda<void()> closedCallback);
class ChatSearchFromController : public PeerListController, protected base::Subscriber {
public:
ChatSearchFromController(not_null<ChatData*> chat, base::lambda<void(not_null<UserData*>)> callback);
ChatSearchFromController(
not_null<Window::Controller*> window,
not_null<ChatData*> chat,
base::lambda<void(not_null<UserData*>)> callback);
void prepare() override;
void rowClicked(not_null<PeerListRow*> row) override;
@ -46,7 +53,10 @@ private:
class ChannelSearchFromController : public Profile::ParticipantsBoxController {
public:
ChannelSearchFromController(not_null<ChannelData*> channel, base::lambda<void(not_null<UserData*>)> callback);
ChannelSearchFromController(
not_null<Window::Controller*> window,
not_null<ChannelData*> channel,
base::lambda<void(not_null<UserData*>)> callback);
void prepare() override;
void rowClicked(not_null<PeerListRow*> row) override;

21
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View File

@ -24,17 +24,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "dialogs/dialogs_search_from_controllers.h"
#include "styles/style_dialogs.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/input_fields.h"
#include "ui/wrap/fade_wrap.h"
#include "lang/lang_keys.h"
#include "application.h"
#include "mainwindow.h"
#include "mainwidget.h"
#include "ui/widgets/input_fields.h"
#include "autoupdater.h"
#include "auth_session.h"
#include "messenger.h"
#include "boxes/peer_list_box.h"
#include "window/window_controller.h"
#include "window/window_slide_animation.h"
#include "profile/profile_channel_controllers.h"
namespace {
@ -873,12 +874,20 @@ void DialogsWidget::clearSearchCache() {
}
void DialogsWidget::showSearchFrom() {
if (!_searchInPeer) {
return;
}
auto peer = _searchInPeer;
Dialogs::ShowSearchFromBox(peer, base::lambda_guarded(this, [this, peer](not_null<UserData*> user) {
Ui::hideLayer();
setSearchInPeer(peer, user);
onFilterUpdate(true);
}), base::lambda_guarded(this, [this] { _filter->setFocus(); }));
Dialogs::ShowSearchFromBox(
controller(),
peer,
base::lambda_guarded(this, [this, peer](
not_null<UserData*> user) {
Ui::hideLayer();
setSearchInPeer(peer, user);
onFilterUpdate(true);
}),
base::lambda_guarded(this, [this] { _filter->setFocus(); }));
}
void DialogsWidget::onFilterCursorMoved(int from, int to) {

28
Telegram/SourceFiles/facades.cpp
View File

@ -39,7 +39,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
Q_DECLARE_METATYPE(ClickHandlerPtr);
Q_DECLARE_METATYPE(Qt::MouseButton);
Q_DECLARE_METATYPE(Ui::ShowWay);
namespace App {
namespace internal {
@ -270,12 +269,10 @@ void autoplayMediaInlineAsync(const FullMsgId &msgId) {
}
void showPeerProfile(const PeerId &peer) {
if (auto main = App::main()) {
// main->showSection(Profile::SectionMemento(App::peer(peer)));
main->showSection(
Info::Memento(peer),
anim::type::normal,
anim::activation::normal);
if (auto window = App::wnd()) {
if (auto controller = window->controller()) {
controller->showPeerInfo(peer);
}
}
}
@ -287,26 +284,15 @@ void showPeerOverview(const PeerId &peer, MediaOverviewType type) {
void showPeerHistory(
const PeerId &peer,
MsgId msgId,
ShowWay way,
anim::type animated,
anim::activation activation) {
MsgId msgId) {
auto ms = getms();
LOG(("Show Peer Start"));
if (MainWidget *m = App::main()) {
m->ui_showPeerHistory(peer, msgId, way, animated, activation);
if (auto m = App::main()) {
m->ui_showPeerHistory(peer, Window::SectionShow(), msgId);
}
LOG(("Show Peer End: %1").arg(getms() - ms));
}
void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way) {
if (MainWidget *m = App::main()) {
InvokeQueued(m, [peer, msgId, way] {
showPeerHistory(peer, msgId, way);
});
}
}
PeerData *getPeerForMouseAction() {
return Messenger::Instance().ui_getPeerForMouseAction();
}

36
Telegram/SourceFiles/facades.h
View File

@ -141,41 +141,21 @@ inline void showPeerOverview(const History *history, MediaOverviewType type) {
showPeerOverview(history->peer->id, type);
}
enum class ShowWay {
ClearStack,
Forward,
Backward,
};
void showPeerHistory(
const PeerId &peer,
MsgId msgId,
ShowWay way = ShowWay::ClearStack,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerHistory(const PeerId &peer, MsgId msgId);
inline void showPeerHistory(
const PeerData *peer,
MsgId msgId,
ShowWay way = ShowWay::ClearStack) {
showPeerHistory(peer->id, msgId, way);
inline void showPeerHistory(const PeerData *peer, MsgId msgId) {
showPeerHistory(peer->id, msgId);
}
inline void showPeerHistory(
const History *history,
MsgId msgId,
ShowWay way = ShowWay::ClearStack) {
showPeerHistory(history->peer->id, msgId, way);
MsgId msgId) {
showPeerHistory(history->peer->id, msgId);
}
inline void showPeerHistoryAtItem(
const HistoryItem *item,
ShowWay way = ShowWay::ClearStack) {
showPeerHistory(item->history()->peer->id, item->id, way);
inline void showPeerHistoryAtItem(const HistoryItem *item) {
showPeerHistory(item->history()->peer->id, item->id);
}
void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way = ShowWay::ClearStack);
inline void showChatsList() {
showPeerHistory(PeerId(0), 0, ShowWay::ClearStack);
}
inline void showChatsListAsync() {
showPeerHistoryAsync(PeerId(0), 0, ShowWay::ClearStack);
showPeerHistory(PeerId(0), 0);
}
PeerData *getPeerForMouseAction();

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

@ -304,7 +304,9 @@ void Widget::doSetInnerFocus() {
}
}
bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
bool Widget::showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
if (auto logMemento = dynamic_cast<SectionMemento*>(memento.get())) {
if (logMemento->getChannel() == channel()) {
restoreState(logMemento);

4
Telegram/SourceFiles/history/history_admin_log_section.h
View File

@ -95,7 +95,9 @@ public:
QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
bool showInternal(not_null<Window::SectionMemento*> memento) override;
bool showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
std::unique_ptr<Window::SectionMemento> createMemento() override;
void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);

7
Telegram/SourceFiles/history/history_item.cpp
View File

@ -35,6 +35,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "auth_session.h"
#include "media/media_audio.h"
#include "messenger.h"
#include "mainwindow.h"
#include "window/window_controller.h"
namespace {
@ -1234,7 +1236,10 @@ ClickHandlerPtr goToMessageClickHandler(PeerData *peer, MsgId msgId) {
if (current && current->history()->peer == peer) {
App::main()->pushReplyReturn(current);
}
Ui::showPeerHistory(peer, msgId, Ui::ShowWay::Forward);
App::wnd()->controller()->showPeerHistory(
peer,
Window::SectionShow::Way::Forward,
msgId);
}
});
}

5
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -34,6 +34,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "core/click_handler_types.h"
#include "history/history_location_manager.h"
#include "history/history_message.h"
#include "window/main_window.h"
#include "window/window_controller.h"
#include "styles/style_history.h"
#include "calls/calls_instance.h"
@ -2940,7 +2941,9 @@ namespace {
ClickHandlerPtr sendMessageClickHandler(PeerData *peer) {
return MakeShared<LambdaClickHandler>([peer] {
Ui::showPeerHistory(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
App::wnd()->controller()->showPeerHistory(
peer->id,
Window::SectionShow::Way::Forward);
});
}

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

@ -73,6 +73,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "auth_session.h"
#include "window/notifications_manager.h"
#include "window/window_controller.h"
#include "window/window_slide_animation.h"
#include "inline_bots/inline_results_widget.h"
#include "chat_helpers/emoji_suggestions_widget.h"
@ -3766,7 +3767,11 @@ void HistoryWidget::pushTabbedSelectorToThirdSection() {
return;
} else if (!_canSendMessages) {
Auth().data().setTabbedReplacedWithInfo(true);
controller()->showPeerInfo(_peer);
controller()->showPeerInfo(_peer,
Window::SectionShow(
Window::SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
return;
}
Auth().data().setTabbedReplacedWithInfo(false);
@ -3784,8 +3789,10 @@ void HistoryWidget::pushTabbedSelectorToThirdSection() {
controller()->resizeForThirdSection();
controller()->showSection(
std::move(memento),
anim::type::instant,
anim::activation::background);
Window::SectionShow(
Window::SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
destroyingPanel.destroy();
}
@ -3795,8 +3802,10 @@ void HistoryWidget::pushInfoToThirdSection() {
}
controller()->showPeerInfo(
_peer,
anim::type::instant,
anim::activation::background);
Window::SectionShow(
Window::SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
}
void HistoryWidget::toggleTabbedSelectorMode() {

8
Telegram/SourceFiles/info/info_common_groups_widget.cpp
View File

@ -28,21 +28,21 @@ namespace CommonGroups {
object_ptr<ContentWidget> Memento::createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) {
auto result = object_ptr<Widget>(
parent,
wrap,
std::move(wrap),
controller,
App::user(_userId));
App::user(userId()));
result->setInternalState(geometry, this);
return std::move(result);
}
Widget::Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<UserData*> user)
: ContentWidget(parent, wrap, controller, user) {

13
Telegram/SourceFiles/info/info_common_groups_widget.h
View File

@ -30,21 +30,24 @@ class InnerWidget;
class Memento final : public ContentMemento {
public:
Memento(UserId userId) : _userId(userId) {
Memento(UserId userId) : ContentMemento(peerFromUser(userId)) {
}
object_ptr<ContentWidget> createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) override;
Section section() const override {
return Section(Section::Type::CommonGroups);
}
UserId userId() const {
return _userId;
return peerToUser(peerId());
}
private:
UserId _userId = 0;
};
@ -52,7 +55,7 @@ class Widget final : public ContentWidget {
public:
Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<UserData*> user);

23
Telegram/SourceFiles/info/info_content_widget.cpp
View File

@ -37,23 +37,22 @@ namespace Info {
ContentWidget::ContentWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer)
: RpWidget(parent)
, _controller(controller)
, _peer(peer)
, _wrap(wrap)
, _scroll(this, st::infoScroll) {
setAttribute(Qt::WA_OpaquePaintEvent);
}
void ContentWidget::setWrap(Wrap wrap) {
if (_wrap != wrap) {
_wrap = wrap;
_wrapChanges.fire_copy(_wrap);
update();
}
std::move(wrap) | rpl::start_with_next(
[this](Wrap value) {
_bg = (value == Wrap::Layer)
? st::boxBg
: st::profileBg;
update();
},
lifetime());
}
void ContentWidget::resizeEvent(QResizeEvent *e) {
@ -76,9 +75,7 @@ void ContentWidget::resizeEvent(QResizeEvent *e) {
void ContentWidget::paintEvent(QPaintEvent *e) {
Painter p(this);
p.fillRect(e->rect(), (_wrap == Wrap::Layer)
? st::boxBg
: st::profileBg);
p.fillRect(e->rect(), _bg);
}
void ContentWidget::setGeometryWithTopMoved(

25
Telegram/SourceFiles/info/info_content_widget.h
View File

@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#pragma once
#include <rpl/variable.h>
#include "ui/rp_widget.h"
#include "info/info_wrap_widget.h"
@ -44,7 +45,7 @@ class ContentWidget : public Ui::RpWidget {
public:
ContentWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer);
@ -54,11 +55,6 @@ public:
virtual rpl::producer<Section> sectionRequest() const;
Wrap wrap() const {
return _wrap;
}
void setWrap(Wrap wrap);
virtual Section section() const = 0;
not_null<PeerData*> peer() const {
return _peer;
@ -94,9 +90,6 @@ protected:
not_null<Window::Controller*> controller() const {
return _controller;
}
rpl::producer<Wrap> wrapValue() const {
return _wrapChanges.events_starting_with_copy(_wrap);
}
void resizeEvent(QResizeEvent *e) override;
void paintEvent(QPaintEvent *e) override;
@ -113,9 +106,8 @@ private:
const not_null<Window::Controller*> _controller;
const not_null<PeerData*> _peer;
Wrap _wrap = Wrap::Layer;
rpl::event_stream<Wrap> _wrapChanges;
style::color _bg;
int _scrollTopSkip = 0;
object_ptr<Ui::ScrollArea> _scroll;
Ui::RpWidget *_inner = nullptr;
@ -127,12 +119,20 @@ private:
class ContentMemento {
public:
ContentMemento(PeerId peerId) : _peerId(peerId) {
}
virtual object_ptr<ContentWidget> createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) = 0;
virtual PeerId peerId() const {
return _peerId;
}
virtual Section section() const = 0;
virtual ~ContentMemento() = default;
void setScrollTop(int scrollTop) {
@ -143,6 +143,7 @@ public:
}
private:
PeerId _peerId = 0;
int _scrollTop = 0;
};

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

@ -75,8 +75,10 @@ void LayerWidget::parentResized() {
localCopy->hideSpecialLayer(anim::type::instant);
localCopy->showSection(
std::move(memento),
anim::type::instant,
anim::activation::background);
Window::SectionShow(
Window::SectionShow::Way::Forward,
anim::type::instant,
anim::activation::background));
} else if (_controller->canShowThirdSectionWithoutResize()) {
takeToThirdSection();
} else {
@ -97,11 +99,19 @@ bool LayerWidget::takeToThirdSection() {
Auth().saveDataDelayed();
localCopy->showSection(
std::move(memento),
anim::type::instant,
anim::activation::background);
Window::SectionShow(
Window::SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
return true;
}
bool LayerWidget::showSectionInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
return _content->showInternal(memento, params);
}
int LayerWidget::MinimalSupportedWidth() {
auto minimalMargins = 2 * st::infoMinimalLayerMargin;
return st::infoMinimalWidth + minimalMargins;

3
Telegram/SourceFiles/info/info_layer_widget.h
View File

@ -46,6 +46,9 @@ public:
void parentResized() override;
bool takeToThirdSection() override;
bool showSectionInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
static int MinimalSupportedWidth();

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

@ -33,16 +33,19 @@ Memento::Memento(PeerId peerId)
}
Memento::Memento(PeerId peerId, Section section)
: Memento(peerId, section, Default(peerId, section)) {
: Memento(Default(peerId, section)) {
}
Memento::Memento(
PeerId peerId,
Section section,
std::unique_ptr<ContentMemento> content)
: _peerId(peerId)
, _section(section)
, _content(std::move(content)) {
Memento::Memento(std::unique_ptr<ContentMemento> content)
: _content(std::move(content)) {
}
PeerId Memento::peerId() const {
return _content->peerId();
}
Section Memento::section() const {
return _content->section();
}
std::unique_ptr<ContentMemento> Memento::Default(

15
Telegram/SourceFiles/info/info_memento.h
View File

@ -42,10 +42,7 @@ class Memento final : public Window::SectionMemento {
public:
Memento(PeerId peerId);
Memento(PeerId peerId, Section section);
Memento(
PeerId peerId,
Section section,
std::unique_ptr<ContentMemento> content);
Memento(std::unique_ptr<ContentMemento> content);
object_ptr<Window::SectionWidget> createWidget(
QWidget *parent,
@ -62,12 +59,8 @@ public:
return _content.get();
}
PeerId peerId() const {
return _peerId;
}
Section section() const {
return _section;
}
PeerId peerId() const;
Section section() const;
~Memento();
@ -76,8 +69,6 @@ private:
PeerId peerId,
Section section);
PeerId _peerId = 0;
Section _section = Section::Type::Profile;
std::unique_ptr<ContentMemento> _content;
};

8
Telegram/SourceFiles/info/info_section_widget.cpp
View File

@ -77,11 +77,9 @@ void SectionWidget::showFinishedHook() {
}
bool SectionWidget::showInternal(
not_null<Window::SectionMemento*> memento) {
if (auto infoMemento = dynamic_cast<Memento*>(memento.get())) {
_content->showInternal(infoMemento);
}
return false;
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
return _content->showInternal(memento, params);
}
std::unique_ptr<Window::SectionMemento> SectionWidget::createMemento() {

3
Telegram/SourceFiles/info/info_section_widget.h
View File

@ -55,7 +55,8 @@ public:
const Window::SectionSlideParams &params) override;
bool showInternal(
not_null<Window::SectionMemento*> memento) override;
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
std::unique_ptr<Window::SectionMemento> createMemento() override;
object_ptr<Window::LayerWidget> moveContentToLayer(

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

@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "info/info_wrap_widget.h"
#include <rpl/flatten_latest.h>
#include <rpl/combine.h>
#include "info/profile/info_profile_widget.h"
#include "info/media/info_media_widget.h"
#include "info/info_content_widget.h"
@ -31,6 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/widgets/shadow.h"
#include "ui/wrap/fade_wrap.h"
#include "window/window_controller.h"
#include "window/window_slide_animation.h"
#include "auth_session.h"
#include "lang/lang_keys.h"
#include "styles/style_info.h"
@ -38,14 +40,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace Info {
struct WrapWidget::StackItem {
std::unique_ptr<ContentMemento> section;
std::unique_ptr<ContentMemento> anotherTab;
};
WrapWidget::WrapWidget(
QWidget *parent,
not_null<Window::Controller*> controller,
Wrap wrap,
not_null<Memento*> memento)
: RpWidget(parent)
, _controller(controller) {
applyState(wrap, memento);
, _wrap(wrap)
, _controller(controller)
, _topShadow(this) {
_topShadow->toggleOn(topShadowToggledValue());
showNewContent(memento->content());
}
not_null<PeerData*> WrapWidget::peer() const {
@ -53,13 +63,15 @@ not_null<PeerData*> WrapWidget::peer() const {
}
Wrap WrapWidget::wrap() const {
return _content->wrap();
return _wrap.current();
}
void WrapWidget::setWrap(Wrap wrap) {
_content->setWrap(wrap);
setupTop(wrap, _content->section(), _content->peer()->id);
finishShowContent();
if (_wrap.current() != wrap) {
_wrap = wrap;
setupTop(_content->section(), _content->peer()->id);
finishShowContent();
}
}
void WrapWidget::createTabs() {
@ -107,10 +119,9 @@ void WrapWidget::setupTabbedTop(const Section &section) {
}
void WrapWidget::setupTop(
Wrap wrap,
const Section &section,
PeerId peerId) {
if (wrap == Wrap::Side) {
if (wrap() == Wrap::Side && _historyStack.empty()) {
setupTabbedTop(section);
} else {
setupTabs(Tab::None);
@ -118,30 +129,30 @@ void WrapWidget::setupTop(
if (_topTabs) {
_topBar.destroy();
} else {
createTopBar(wrap, section, peerId);
createTopBar(section, peerId);
}
}
void WrapWidget::createTopBar(
Wrap wrap,
const Section &section,
PeerId peerId) {
_topBar = object_ptr<TopBar>(
_topBar.create(
this,
(wrap == Wrap::Layer)
(wrap() == Wrap::Layer)
? st::infoLayerTopBar
: st::infoTopBar);
_topBar->setTitle(TitleValue(
section,
peerId));
if (wrap != Wrap::Layer) {
if (wrap() != Wrap::Layer || !_historyStack.empty()) {
_topBar->enableBackButton(true);
_topBar->backRequest()
| rpl::start_with_next([this] {
_controller->showBackFromStack();
showBackFromStack();
}, _topBar->lifetime());
}
if (wrap == Wrap::Layer) {
if (wrap() == Wrap::Layer) {
auto close = _topBar->addButton(object_ptr<Ui::IconButton>(
_topBar,
st::infoLayerTopBarClose));
@ -150,6 +161,25 @@ void WrapWidget::createTopBar(
_controller->hideSpecialLayer();
}, close->lifetime());
}
_topBar->move(0, 0);
_topBar->resizeToWidth(width());
_topBar->show();
}
void WrapWidget::showBackFromStack() {
auto params = Window::SectionShow(
Window::SectionShow::Way::Backward);
if (!_historyStack.empty()) {
auto last = std::move(_historyStack.back());
_historyStack.pop_back();
_anotherTabMemento = std::move(last.anotherTab);
showNewContent(
last.section.get(),
params);
} else {
_controller->showBackFromStack(params);
}
}
not_null<Ui::RpWidget*> WrapWidget::topWidget() const {
@ -159,36 +189,55 @@ not_null<Ui::RpWidget*> WrapWidget::topWidget() const {
return _topBar;
}
int WrapWidget::topHeightAddition() const {
return _topTabs ? -st::lineWidth : 0;
}
int WrapWidget::topHeight() const {
return topWidget()->height() + topHeightAddition();
}
rpl::producer<int> WrapWidget::topHeightValue() const {
using namespace rpl::mappers;
return topWidget()->heightValue()
| rpl::map($1 + topHeightAddition());
}
void WrapWidget::showContent(object_ptr<ContentWidget> content) {
_content = std::move(content);
_content->show();
_topShadow->raise();
if (_topTabs) {
_topTabs->raise();
}
finishShowContent();
}
void WrapWidget::finishShowContent() {
_topShadow.create(this);
_topShadow->toggleOn((wrap() == Wrap::Side)
? rpl::single(true)
: _content->desiredShadowVisibility());
updateContentGeometry();
_desiredHeights.fire(desiredHeightForContent());
_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
if (_topTabs) {
_topTabs->finishAnimating();
}
_topShadow->finishAnimating();
}
updateContentGeometry();
_desiredHeights.fire(desiredHeightForContent());
rpl::producer<bool> WrapWidget::topShadowToggledValue() const {
using namespace rpl::mappers;
return rpl::combine(
_wrap.value(),
_desiredShadowVisibilities.events() | rpl::flatten_latest(),
($1 == Wrap::Side) || $2);
}
rpl::producer<int> WrapWidget::desiredHeightForContent() const {
auto result = _content->desiredHeightValue();
if (_topTabs) {
result = std::move(result)
| rpl::map(func::add(_topTabs->height()));
}
return result;
using namespace rpl::mappers;
return rpl::combine(
_content->desiredHeightValue(),
topHeightValue(),
$1 + $2);
}
object_ptr<ContentWidget> WrapWidget::createContent(Tab tab) {
@ -202,7 +251,7 @@ object_ptr<ContentWidget> WrapWidget::createContent(Tab tab) {
object_ptr<Profile::Widget> WrapWidget::createProfileWidget() {
auto result = object_ptr<Profile::Widget>(
this,
Wrap::Side,
_wrap.value(),
controller(),
_content->peer());
return result;
@ -211,13 +260,22 @@ object_ptr<Profile::Widget> WrapWidget::createProfileWidget() {
object_ptr<Media::Widget> WrapWidget::createMediaWidget() {
auto result = object_ptr<Media::Widget>(
this,
Wrap::Side,
_wrap.value(),
controller(),
_content->peer(),
Media::Widget::Type::Photo);
return result;
}
object_ptr<ContentWidget> WrapWidget::createContent(
not_null<ContentMemento*> memento) {
return memento->createWidget(
this,
_wrap.value(),
controller(),
contentGeometry());
}
bool WrapWidget::hasTopBarShadow() const {
return _topShadow->toggled();
}
@ -238,18 +296,22 @@ void WrapWidget::showFinished() {
}
bool WrapWidget::showInternal(
not_null<Window::SectionMemento*> memento) {
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
if (auto infoMemento = dynamic_cast<Memento*>(memento.get())) {
if (infoMemento->peerId() == peer()->id) {
applyState(_content->wrap(), infoMemento);
return true;
auto content = infoMemento->content();
if (!_content->showInternal(content)) {
showNewContent(
content,
params);
}
return true;
}
return false;
}
std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
auto result = std::make_unique<Memento>(peer()->id);
auto result = std::make_unique<Memento>(_content->peer()->id);
saveState(result.get());
return std::move(result);
}
@ -266,17 +328,40 @@ void WrapWidget::saveState(not_null<Memento*> memento) {
}
QRect WrapWidget::contentGeometry() const {
return rect().marginsRemoved({ 0, topWidget()->height(), 0, 0 });
return rect().marginsRemoved({ 0, topHeight(), 0, 0 });
}
void WrapWidget::applyState(Wrap wrap, not_null<Memento*> memento) {
void WrapWidget::showNewContent(
not_null<ContentMemento*> memento,
const Window::SectionShow &params) {
auto saveToStack = (_content != nullptr)
&& (params.way == Window::SectionShow::Way::Forward);
auto showAnimated = (_content != nullptr)
&& (params.animated != anim::type::instant);
if (showAnimated) {
auto newContent = createContent(memento);
auto params = SectionSlideParams();
// params.withTopBarShadow = newContent;
} else {
}
if (saveToStack) {
auto item = StackItem();
item.section = _content->createMemento();
if (_anotherTabMemento) {
item.anotherTab = std::move(_anotherTabMemento);
}
_historyStack.push_back(std::move(item));
} else if (params.way == Window::SectionShow::Way::ClearStack) {
_historyStack.clear();
}
showNewContent(memento);
}
void WrapWidget::showNewContent(not_null<ContentMemento*> memento) {
// Validates contentGeometry().
setupTop(wrap, memento->section(), memento->peerId());
showContent(memento->content()->createWidget(
this,
wrap,
controller(),
contentGeometry()));
setupTop(memento->section(), memento->peerId());
showContent(createContent(memento));
}
void WrapWidget::setupTabs(Tab tab) {
@ -298,7 +383,7 @@ void WrapWidget::resizeEvent(QResizeEvent *e) {
void WrapWidget::updateContentGeometry() {
if (_content) {
_topShadow->resizeToWidth(width());
_topShadow->moveToLeft(0, topWidget()->height());
_topShadow->moveToLeft(0, topHeight());
_content->setGeometry(contentGeometry());
}
}
@ -316,4 +401,6 @@ QRect WrapWidget::rectForFloatPlayer() const {
return _content->rectForFloatPlayer();
}
WrapWidget::~WrapWidget() = default;
} // namespace Info

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

@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#pragma once
#include <rpl/variable.h>
#include <rpl/event_stream.h>
#include "window/section_widget.h"
@ -28,6 +29,10 @@ class SettingsSlider;
class FadeShadow;
} // namespace Ui
namespace Window {
enum class SlideDirection;
} // namespace Window
namespace Info {
namespace Profile {
class Widget;
@ -40,6 +45,7 @@ class Widget;
class Section;
class Memento;
class MoveMemento;
class ContentMemento;
class ContentWidget;
class TopBar;
@ -97,7 +103,8 @@ public:
const Window::SectionSlideParams &params);
bool showInternal(
not_null<Window::SectionMemento*> memento);
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params);
std::unique_ptr<Window::SectionMemento> createMemento();
rpl::producer<int> desiredHeightValue() const;
@ -112,6 +119,8 @@ public:
bool wheelEventFromFloatPlayer(QEvent *e);
QRect rectForFloatPlayer() const;
~WrapWidget();
protected:
void resizeEvent(QResizeEvent *e);
void paintEvent(QPaintEvent *e);
@ -121,25 +130,37 @@ protected:
}
private:
using SlideDirection = Window::SlideDirection;
using SectionSlideParams = Window::SectionSlideParams;
enum class Tab {
Profile,
Media,
None,
};
void applyState(Wrap wrap, not_null<Memento*> memento);
void setupTop(Wrap wrap, const Section &section, PeerId peerId);
struct StackItem;
void showBackFromStack();
void showNewContent(not_null<ContentMemento*> memento);
void showNewContent(
not_null<ContentMemento*> memento,
const Window::SectionShow &params);
void setupTop(const Section &section, PeerId peerId);
void setupTabbedTop(const Section &section);
void setupTabs(Tab tab);
void createTabs();
void createTopBar(
Wrap wrap,
const Section &section,
PeerId peerId);
not_null<RpWidget*> topWidget() const;
int topHeightAddition() const;
int topHeight() const;
rpl::producer<int> topHeightValue() const;
QRect contentGeometry() const;
rpl::producer<int> desiredHeightForContent() const;
void finishShowContent();
rpl::producer<bool> topShadowToggledValue() const;
void updateContentGeometry();
void showTab(Tab tab);
@ -147,15 +168,21 @@ private:
object_ptr<ContentWidget> createContent(Tab tab);
object_ptr<Profile::Widget> createProfileWidget();
object_ptr<Media::Widget> createMediaWidget();
object_ptr<ContentWidget> createContent(
not_null<ContentMemento*> memento);
rpl::variable<Wrap> _wrap;
not_null<Window::Controller*> _controller;
object_ptr<ContentWidget> _content = { nullptr };
object_ptr<Ui::SettingsSlider> _topTabs = { nullptr };
object_ptr<TopBar> _topBar = { nullptr };
object_ptr<Ui::FadeShadow> _topShadow = { nullptr };
object_ptr<Ui::FadeShadow> _topShadow;
Tab _tab = Tab::Profile;
std::unique_ptr<ContentMemento> _anotherTabMemento;
std::vector<StackItem> _historyStack;
rpl::event_stream<rpl::producer<int>> _desiredHeights;
rpl::event_stream<rpl::producer<bool>> _desiredShadowVisibilities;
};

10
Telegram/SourceFiles/info/media/info_media_widget.cpp
View File

@ -28,14 +28,14 @@ namespace Media {
object_ptr<ContentWidget> Memento::createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) {
auto result = object_ptr<Widget>(
parent,
wrap,
std::move(wrap),
controller,
App::peer(_peerId),
App::peer(peerId()),
_type);
result->setInternalState(geometry, this);
return std::move(result);
@ -43,11 +43,11 @@ object_ptr<ContentWidget> Memento::createWidget(
Widget::Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer,
Type type)
: ContentWidget(parent, wrap, controller, peer) {
: ContentWidget(parent, std::move(wrap), controller, peer) {
_inner = setInnerWidget(object_ptr<InnerWidget>(this, peer, type));
}

14
Telegram/SourceFiles/info/media/info_media_widget.h
View File

@ -34,25 +34,25 @@ public:
using Type = Storage::SharedMediaType;
Memento(PeerId peerId, Type type)
: _peerId(peerId)
, _type(type) {
: ContentMemento(peerId)
, _type(type) {
}
object_ptr<ContentWidget> createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) override;
PeerId peerId() const {
return _peerId;
Section section() const override {
return Section(_type);
}
Type type() const {
return _type;
}
private:
PeerId _peerId = 0;
Type _type = Type::Photo;
};
@ -63,7 +63,7 @@ public:
Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer,
Type type);

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

@ -35,6 +35,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "mainwidget.h"
#include "auth_session.h"
#include "apiwrap.h"
#include "window/main_window.h"
#include "window/window_controller.h"
#include "storage/storage_shared_media.h"
#include "lang/lang_keys.h"
@ -243,7 +244,7 @@ void InnerWidget::setupUserButtons(
| rpl::start_with_next([this, user] {
_controller->showPeerHistory(
user,
Ui::ShowWay::Forward);
Window::SectionShow::Way::Forward);
}, wrap->lifetime());
addButton(
@ -322,12 +323,10 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
return lng_profile_common_groups(lt_count, count);
}
)->entity()->clicks()
| rpl::start_with_next([peer = _peer] {
App::main()->showSection(
| rpl::start_with_next([this, peer = _peer] {
_controller->showSection(
::Profile::CommonGroups::SectionMemento(
peer->asUser()),
anim::type::normal,
anim::activation::normal);
peer->asUser()));
}, content->lifetime());
};
addMediaButton(MediaType::Photo);

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

@ -52,7 +52,7 @@ Members::Members(
not_null<PeerData*> peer)
: RpWidget(parent)
, _peer(peer)
, _controller(CreateMembersController(_peer))
, _listController(CreateMembersController(controller, _peer))
, _labelWrap(this)
, _label(setupHeader())
, _addMember(this, st::infoMembersAddMember)
@ -62,7 +62,7 @@ Members::Members(
langFactory(lng_participant_filter))
, _search(this, st::infoMembersSearch)
, _cancelSearch(this, st::infoMembersCancelSearch)
, _list(setupList(this, _controller.get())) {
, _list(setupList(this, _listController.get())) {
setupButtons();
std::move(wrapValue)
| rpl::start_with_next([this](Wrap wrap) {
@ -70,7 +70,7 @@ Members::Members(
updateSearchOverrides();
}, lifetime());
setContent(_list.data());
_controller->setDelegate(static_cast<PeerListDelegate*>(this));
_listController->setDelegate(static_cast<PeerListDelegate*>(this));
}
int Members::desiredHeight() const {

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

@ -99,7 +99,7 @@ private:
Wrap _wrap;
not_null<PeerData*> _peer;
std::unique_ptr<PeerListController> _controller;
std::unique_ptr<PeerListController> _listController;
object_ptr<Ui::RpWidget> _labelWrap;
object_ptr<Ui::FlatLabel> _label;
object_ptr<Ui::IconButton> _addMember;

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

@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "apiwrap.h"
#include "auth_session.h"
#include "observer_peer.h"
#include "window/window_controller.h"
namespace Info {
namespace Profile {
@ -34,7 +35,9 @@ class ChatMembersController
: public PeerListController
, private base::Subscriber {
public:
ChatMembersController(not_null<ChatData*> chat);
ChatMembersController(
not_null<Window::Controller*> window,
not_null<ChatData*> chat);
void prepare() override;
void rowClicked(not_null<PeerListRow*> row) override;
@ -43,12 +46,16 @@ private:
void rebuildRows();
std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user);
not_null<Window::Controller*> _window;
not_null<ChatData*> _chat;
};
ChatMembersController::ChatMembersController(not_null<ChatData*> chat)
ChatMembersController::ChatMembersController(
not_null<Window::Controller*> window,
not_null<ChatData*> chat)
: PeerListController()
, _window(window)
, _chat(chat) {
}
@ -110,19 +117,23 @@ std::unique_ptr<PeerListRow> ChatMembersController::createRow(not_null<UserData*
}
void ChatMembersController::rowClicked(not_null<PeerListRow*> row) {
Ui::showPeerProfile(row->peer());
_window->showPeerInfo(row->peer());
}
} // namespace
std::unique_ptr<PeerListController> CreateMembersController(
not_null<Window::Controller*> window,
not_null<PeerData*> peer) {
if (auto chat = peer->asChat()) {
return std::make_unique<ChatMembersController>(chat);
return std::make_unique<ChatMembersController>(
window,
chat);
} else if (auto channel = peer->asChannel()) {
using ChannelMembersController
= ::Profile::ParticipantsBoxController;
return std::make_unique<ChannelMembersController>(
window,
channel,
ChannelMembersController::Role::Profile);
}

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

@ -22,10 +22,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
class PeerListController;
namespace Window {
class Controller;
} // namespace Window
namespace Info {
namespace Profile {
std::unique_ptr<PeerListController> CreateMembersController(
not_null<Window::Controller*> window,
not_null<PeerData*> peer);
} // namespace Profile

12
Telegram/SourceFiles/info/profile/info_profile_widget.cpp
View File

@ -28,27 +28,27 @@ namespace Profile {
object_ptr<ContentWidget> Memento::createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) {
auto result = object_ptr<Widget>(
parent,
wrap,
std::move(wrap),
controller,
App::peer(_peerId));
App::peer(peerId()));
result->setInternalState(geometry, this);
return std::move(result);
}
Widget::Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer)
: ContentWidget(parent, wrap, controller, peer) {
: ContentWidget(parent, rpl::duplicate(wrap), controller, peer) {
_inner = setInnerWidget(object_ptr<InnerWidget>(
this,
wrapValue(),
std::move(wrap),
controller,
peer));
_inner->move(0, 0);

11
Telegram/SourceFiles/info/profile/info_profile_widget.h
View File

@ -30,17 +30,17 @@ class InnerWidget;
class Memento final : public ContentMemento {
public:
Memento(PeerId peerId) : _peerId(peerId) {
Memento(PeerId peerId) : ContentMemento(peerId) {
}
object_ptr<ContentWidget> createWidget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
const QRect &geometry) override;
PeerId peerId() const {
return _peerId;
Section section() const override {
return Section(Section::Type::Profile);
}
void setScrollTop(int scrollTop) {
@ -51,7 +51,6 @@ public:
}
private:
PeerId _peerId = 0;
int _scrollTop = 0;
};
@ -60,7 +59,7 @@ class Widget final : public ContentWidget {
public:
Widget(
QWidget *parent,
Wrap wrap,
rpl::producer<Wrap> wrap,
not_null<Window::Controller*> controller,
not_null<PeerData*> peer);

131
Telegram/SourceFiles/mainwidget.cpp
View File

@ -72,14 +72,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "base/qthelp_regex.h"
#include "base/qthelp_url.h"
#include "base/flat_set.h"
#include "window/themes/window_theme.h"
#include "window/player_wrap_widget.h"
#include "window/notifications_manager.h"
#include "window/window_slide_animation.h"
#include "window/window_controller.h"
#include "window/themes/window_theme.h"
#include "styles/style_boxes.h"
#include "mtproto/dc_options.h"
#include "core/file_utilities.h"
#include "auth_session.h"
#include "window/notifications_manager.h"
#include "window/window_controller.h"
#include "calls/calls_instance.h"
#include "calls/calls_top_bar.h"
#include "auth_session.h"
@ -2460,10 +2461,8 @@ void MainWidget::ctrlEnterSubmitUpdated() {
void MainWidget::ui_showPeerHistory(
PeerId peerId,
MsgId showAtMsgId,
Ui::ShowWay way,
anim::type animated,
anim::activation activation) {
const SectionShow &params,
MsgId showAtMsgId) {
if (auto peer = App::peerLoaded(peerId)) {
if (peer->migrateTo()) {
peer = peer->migrateTo();
@ -2472,7 +2471,7 @@ void MainWidget::ui_showPeerHistory(
}
auto restriction = peer->restrictionReason();
if (!restriction.isEmpty()) {
if (activation != anim::activation::background) {
if (params.activation != anim::activation::background) {
Ui::show(Box<InformBox>(restriction));
}
return;
@ -2482,9 +2481,11 @@ void MainWidget::ui_showPeerHistory(
_controller->dialogsListFocused().set(false, true);
_a_dialogsWidth.finish();
bool back = (way == Ui::ShowWay::Backward || !peerId);
using Way = SectionShow::Way;
auto way = params.way;
bool back = (way == Way::Backward || !peerId);
bool foundInStack = !peerId;
if (foundInStack || (way == Ui::ShowWay::ClearStack)) {
if (foundInStack || (way == Way::ClearStack)) {
for_const (auto &item, _stack) {
clearBotStartToken(item->peer);
}
@ -2505,14 +2506,14 @@ void MainWidget::ui_showPeerHistory(
}
}
if (auto historyPeer = _history->peer()) {
if (way == Ui::ShowWay::Forward && historyPeer->id == peerId) {
way = Ui::ShowWay::ClearStack;
if (way == Way::Forward && historyPeer->id == peerId) {
way = Way::ClearStack;
}
}
}
auto wasActivePeer = activePeer();
if (activation != anim::activation::background) {
if (params.activation != anim::activation::background) {
Ui::hideSettingsAndLayer();
}
if (_hider) {
@ -2520,8 +2521,10 @@ void MainWidget::ui_showPeerHistory(
_hider = nullptr;
}
auto animatedShow = [this, peerId, back, way] {
if (_a_show.animating() || App::passcoded()) {
auto animatedShow = [&] {
if (_a_show.animating()
|| App::passcoded()
|| (params.animated == anim::type::instant)) {
return false;
}
if (!peerId) {
@ -2536,7 +2539,7 @@ void MainWidget::ui_showPeerHistory(
|| (_overview != nullptr)
|| (Adaptive::OneColumn() && !_dialogs->isHidden());
}
if (back || way == Ui::ShowWay::Forward) {
if (back || way == Way::Forward) {
return true;
}
return false;
@ -2545,7 +2548,7 @@ void MainWidget::ui_showPeerHistory(
auto animationParams = animatedShow() ? prepareHistoryAnimation(peerId) : Window::SectionSlideParams();
dlgUpdated();
if (back || (way == Ui::ShowWay::ClearStack)) {
if (back || (way == Way::ClearStack)) {
_peerInStack = nullptr;
_msgIdInStack = 0;
} else {
@ -2554,7 +2557,7 @@ void MainWidget::ui_showPeerHistory(
}
dlgUpdated();
if (_history->peer() && _history->peer()->id != peerId && way != Ui::ShowWay::Forward) {
if (_history->peer() && _history->peer()->id != peerId && way != Way::Forward) {
clearBotStartToken(_history->peer());
}
_history->showHistory(peerId, showAtMsgId);
@ -2766,11 +2769,14 @@ void MainWidget::showMediaOverview(PeerData *peer, MediaOverviewType type, bool
void MainWidget::showSection(
Window::SectionMemento &&memento,
anim::type animated,
anim::activation activation) {
if (_mainSection && _mainSection->showInternal(&memento)) {
const SectionShow &params) {
if (_mainSection && _mainSection->showInternal(
&memento,
params)) {
return;
} else if (_thirdSection && _thirdSection->showInternal(&memento)) {
} else if (_thirdSection && _thirdSection->showInternal(
&memento,
params)) {
return;
}
@ -2781,10 +2787,7 @@ void MainWidget::showSection(
showNewSection(
std::move(memento),
false,
true,
animated,
activation);
params);
}
void MainWidget::updateColumnLayout() {
@ -2914,12 +2917,10 @@ Window::SectionSlideParams MainWidget::prepareDialogsAnimation() {
void MainWidget::showNewSection(
Window::SectionMemento &&memento,
bool back,
bool saveInStack,
anim::type animated,
anim::activation activation) {
const SectionShow &params) {
using Column = Window::Column;
auto saveInStack = (params.way == SectionShow::Way::Forward);
auto thirdSectionTop = getThirdSectionTop();
auto newThirdGeometry = QRect(
width() - st::columnMinimalWidthThird,
@ -2942,7 +2943,7 @@ void MainWidget::showNewSection(
}
}
if (activation != anim::activation::background) {
if (params.activation != anim::activation::background) {
Ui::hideSettingsAndLayer();
}
@ -2969,7 +2970,7 @@ void MainWidget::showNewSection(
auto animatedShow = [&] {
if (_a_show.animating()
|| App::passcoded()
|| (animated == anim::type::instant)
|| (params.animated == anim::type::instant)
|| memento.instant()) {
return false;
}
@ -3025,6 +3026,7 @@ void MainWidget::showNewSection(
}
if (animationParams) {
auto back = (params.way == SectionShow::Way::Backward);
auto direction = (back || settingSection->forceAnimateBack())
? Window::SlideDirection::FromLeft
: Window::SlideDirection::FromRight;
@ -3056,8 +3058,9 @@ void MainWidget::dropMainSection(Window::SectionWidget *widget) {
}
_mainSection.destroy();
_controller->showBackFromStack(
anim::type::instant,
anim::activation::background);
SectionShow(
anim::type::instant,
anim::activation::background));
}
bool MainWidget::isMainSectionShown() const {
@ -3073,11 +3076,10 @@ bool MainWidget::stackIsEmpty() const {
}
void MainWidget::showBackFromStack(
anim::type animated,
anim::activation activation) {
const SectionShow &params) {
if (selectingPeer()) return;
if (_stack.empty()) {
_controller->clearSectionStack(animated, activation);
_controller->clearSectionStack(params);
if (App::wnd()) QTimer::singleShot(0, App::wnd(), SLOT(setInnerFocus()));
return;
}
@ -3102,19 +3104,14 @@ void MainWidget::showBackFromStack(
auto historyItem = static_cast<StackItemHistory*>(item.get());
_controller->showPeerHistory(
historyItem->peer->id,
Ui::ShowWay::Backward,
ShowAtUnreadMsgId,
animated,
activation);
params.withWay(SectionShow::Way::Backward),
ShowAtUnreadMsgId);
_history->setReplyReturns(historyItem->peer->id, historyItem->replyReturns);
} else if (item->type() == SectionStackItem) {
auto sectionItem = static_cast<StackItemSection*>(item.get());
showNewSection(
std::move(*sectionItem->memento()),
true,
false,
animated,
activation);
params.withWay(SectionShow::Way::Backward));
} else if (item->type() == OverviewStackItem) {
auto overviewItem = static_cast<StackItemOverview*>(item.get());
showMediaOverview(
@ -3569,8 +3566,10 @@ void MainWidget::updateThirdColumnToCurrentPeer(
if (!canWrite) {
_controller->showPeerInfo(
peer,
anim::type::instant,
anim::activation::background);
SectionShow(
SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
Auth().data().setTabbedSelectorSectionEnabled(true);
Auth().data().setTabbedReplacedWithInfo(true);
} else if (Auth().data().tabbedReplacedWithInfo()) {
@ -3586,8 +3585,10 @@ void MainWidget::updateThirdColumnToCurrentPeer(
&& Auth().data().thirdSectionInfoEnabled()) {
_controller->showPeerInfo(
peer,
anim::type::instant,
anim::activation::background);
SectionShow(
SectionShow::Way::ClearStack,
anim::type::instant,
anim::activation::background));
}
}
}
@ -4290,7 +4291,11 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
peer->asUser()->botInfo->shareGameShortName = startToken;
AddBotToGroupBoxController::Start(peer->asUser());
} else {
Ui::showPeerHistoryAsync(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
InvokeQueued(this, [this, peer] {
_controller->showPeerHistory(
peer->id,
SectionShow::Way::Forward);
});
}
} else if (msgId == ShowAtProfileMsgId && !peer->isChannel()) {
if (peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->cantJoinGroups && !startToken.isEmpty()) {
@ -4298,7 +4303,11 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
AddBotToGroupBoxController::Start(peer->asUser());
} else if (peer->isUser() && peer->asUser()->botInfo) {
// Always open bot chats, even from mention links.
Ui::showPeerHistoryAsync(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
InvokeQueued(this, [this, peer] {
_controller->showPeerHistory(
peer->id,
SectionShow::Way::Forward);
});
} else {
_controller->showPeerInfo(peer);
}
@ -4313,7 +4322,12 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
_history->updateControlsGeometry();
}
}
Ui::showPeerHistoryAsync(peer->id, msgId, Ui::ShowWay::Forward);
InvokeQueued(this, [this, peer, msgId] {
_controller->showPeerHistory(
peer->id,
SectionShow::Way::Forward,
msgId);
});
}
} else {
MTP::send(MTPcontacts_ResolveUsername(MTP_string(username)), rpcDone(&MainWidget::usernameResolveDone, qMakePair(msgId, startToken)), rpcFail(&MainWidget::usernameResolveFail, username));
@ -4376,7 +4390,11 @@ void MainWidget::usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, c
AddBotToGroupBoxController::Start(peer->asUser());
} else if (peer->isUser() && peer->asUser()->botInfo) {
// Always open bot chats, even from mention links.
Ui::showPeerHistoryAsync(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
InvokeQueued(this, [this, peer] {
_controller->showPeerHistory(
peer->id,
SectionShow::Way::Forward);
});
} else {
_controller->showPeerInfo(peer);
}
@ -4391,7 +4409,12 @@ void MainWidget::usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, c
_history->updateControlsGeometry();
}
}
Ui::showPeerHistory(peer->id, msgId, Ui::ShowWay::Forward);
InvokeQueued(this, [this, peer, msgId] {
_controller->showPeerHistory(
peer->id,
SectionShow::Way::Forward,
msgId);
});
}
}

26
Telegram/SourceFiles/mainwidget.h
View File

@ -58,6 +58,7 @@ class SectionMemento;
class SectionWidget;
class AbstractSectionWidget;
struct SectionSlideParams;
struct SectionShow;
enum class Column;
} // namespace Window
@ -154,6 +155,8 @@ class MainWidget : public Ui::RpWidget, public RPCSender, private base::Subscrib
Q_OBJECT
public:
using SectionShow = Window::SectionShow;
MainWidget(QWidget *parent, not_null<Window::Controller*> controller);
bool isMainSectionShown() const;
@ -215,14 +218,16 @@ public:
bool showMediaTypeSwitch() const;
void showSection(
Window::SectionMemento &&memento,
anim::type animated,
anim::activation activation);
const SectionShow &params);
void updateColumnLayout();
void showMediaOverview(PeerData *peer, MediaOverviewType type, bool back = false, int32 lastScrollTop = -1);
void showMediaOverview(
PeerData *peer,
MediaOverviewType type,
bool back = false,
int32 lastScrollTop = -1);
bool stackIsEmpty() const;
void showBackFromStack(
anim::type animated,
anim::activation activation);
const SectionShow &params);
void orderWidgets();
QRect historyRect() const;
QPixmap grabForShowAnimation(const Window::SectionSlideParams &params);
@ -396,10 +401,8 @@ public:
void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
void ui_showPeerHistory(
PeerId peer,
MsgId msgId,
Ui::ShowWay way,
anim::type animated,
anim::activation activation);
const SectionShow &params,
MsgId msgId);
PeerData *ui_getPeerForMouseAction();
void notify_botCommandsChanged(UserData *bot);
@ -537,10 +540,7 @@ private:
bool willHaveTopBarShadow);
void showNewSection(
Window::SectionMemento &&memento,
bool back,
bool saveInStack,
anim::type animated,
anim::activation activation);
const SectionShow &params);
void dropMainSection(Window::SectionWidget *widget);
Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);

9
Telegram/SourceFiles/mainwindow.cpp
View File

@ -338,6 +338,15 @@ void MainWindow::showSpecialLayer(
}
}
bool MainWindow::showSectionInExistingLayer(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
if (_layerBg) {
return _layerBg->showSectionInternal(memento, params);
}
return false;
}
void MainWindow::showMainMenu() {
if (_passcode) return;

5
Telegram/SourceFiles/mainwindow.h
View File

@ -38,6 +38,8 @@ class ClearManager;
namespace Window {
class LayerStackWidget;
class SectionMemento;
struct SectionShow;
namespace Theme {
struct BackgroundUpdate;
class WarningWidget;
@ -137,6 +139,9 @@ public:
void showSpecialLayer(
object_ptr<Window::LayerWidget> layer,
anim::type animated);
bool showSectionInExistingLayer(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params);
void ui_showBox(
object_ptr<BoxContent> box,
LayerOptions options,

8
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -32,7 +32,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/widgets/input_fields.h"
#include "ui/widgets/shadow.h"
#include "window/top_bar_widget.h"
#include "window/window_slide_animation.h"
#include "window/themes/window_theme.h"
#include "window/window_controller.h"
#include "lang/lang_keys.h"
#include "mainwindow.h"
#include "mainwidget.h"
@ -1132,7 +1134,7 @@ void OverviewInner::keyPressEvent(QKeyEvent *e) {
if ((_search->isHidden() || !_search->hasFocus()) && !_overview->isHidden() && e->key() == Qt::Key_Escape) {
onCancel();
} else if (e->key() == Qt::Key_Back) {
App::main()->showBackFromStack(anim::type::normal, anim::activation::normal);
App::main()->showBackFromStack(Window::SectionShow());
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
onSearchMessages();
}
@ -1528,7 +1530,7 @@ void OverviewInner::onSearchUpdate() {
void OverviewInner::onCancel() {
if (_selected.isEmpty()) {
if (onCancelSearch()) return;
App::main()->showBackFromStack(anim::type::normal, anim::activation::normal);
App::main()->showBackFromStack(Window::SectionShow());
} else {
_overview->onClearSelected();
}
@ -2071,7 +2073,7 @@ bool OverviewWidget::paintTopBar(Painter &p, int decreaseWidth) {
}
void OverviewWidget::topBarClick() {
App::main()->showBackFromStack(anim::type::normal, anim::activation::normal);
App::main()->showBackFromStack(Window::SectionShow());
}
PeerData *OverviewWidget::peer() const {

6
Telegram/SourceFiles/profile/profile_block_actions.cpp
View File

@ -31,6 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "auth_session.h"
#include "lang/lang_keys.h"
#include "profile/profile_channel_controllers.h"
#include "mainwindow.h"
namespace Profile {
@ -362,7 +363,10 @@ void ActionsWidget::onLeaveChannel() {
void ActionsWidget::onSearchMembers() {
if (auto channel = peer()->asChannel()) {
ParticipantsBoxController::Start(channel, ParticipantsBoxController::Role::Members);
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Members);
}
}

11
Telegram/SourceFiles/profile/profile_block_channel_members.cpp
View File

@ -27,6 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "mainwidget.h"
#include "history/history_admin_log_section.h"
#include "lang/lang_keys.h"
#include "mainwindow.h"
#include "window/window_controller.h"
namespace Profile {
@ -143,13 +145,17 @@ int ChannelMembersWidget::resizeGetHeight(int newWidth) {
void ChannelMembersWidget::onMembers() {
if (auto channel = peer()->asChannel()) {
ParticipantsBoxController::Start(channel, ParticipantsBoxController::Role::Members);
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Members);
}
}
void ChannelMembersWidget::onAdmins() {
if (auto channel = peer()->asChannel()) {
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Admins);
}
@ -160,8 +166,7 @@ void ChannelMembersWidget::onRecentActions() {
if (auto main = App::main()) {
main->showSection(
AdminLog::SectionMemento(channel),
anim::type::normal,
anim::activation::normal);
Window::SectionShow());
}
}
}

8
Telegram/SourceFiles/profile/profile_block_settings.cpp
View File

@ -30,6 +30,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "observer_peer.h"
#include "auth_session.h"
#include "mainwidget.h"
#include "mainwindow.h"
#include "window/window_controller.h"
#include "apiwrap.h"
#include "lang/lang_keys.h"
@ -213,6 +215,7 @@ void SettingsWidget::onManageAdmins() {
EditChatAdminsBoxController::Start(chat);
} else if (auto channel = peer()->asChannel()) {
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Admins);
}
@ -223,8 +226,7 @@ void SettingsWidget::onRecentActions() {
if (auto main = App::main()) {
main->showSection(
AdminLog::SectionMemento(channel),
anim::type::normal,
anim::activation::normal);
Window::SectionShow());
}
}
}
@ -232,6 +234,7 @@ void SettingsWidget::onRecentActions() {
void SettingsWidget::onManageBannedUsers() {
if (auto channel = peer()->asMegagroup()) {
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Kicked);
}
@ -240,6 +243,7 @@ void SettingsWidget::onManageBannedUsers() {
void SettingsWidget::onManageRestrictedUsers() {
if (auto channel = peer()->asMegagroup()) {
ParticipantsBoxController::Start(
App::wnd()->controller(),
channel,
ParticipantsBoxController::Role::Restricted);
}

4
Telegram/SourceFiles/profile/profile_block_shared_media.cpp
View File

@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/widgets/buttons.h"
#include "mainwidget.h"
#include "lang/lang_keys.h"
#include "window/window_controller.h"
namespace Profile {
namespace {
@ -203,8 +204,7 @@ void SharedMediaWidget::onShowCommonGroups() {
if (auto main = App::main()) {
main->showSection(
Profile::CommonGroups::SectionMemento(peer()->asUser()),
anim::type::normal,
anim::activation::normal);
Window::SectionShow());
}
}

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

@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "mainwidget.h"
#include "observer_peer.h"
#include "dialogs/dialogs_indexed_list.h"
#include "window/window_controller.h"
namespace Profile {
namespace {
@ -41,9 +42,11 @@ constexpr auto kSortByOnlineDelay = TimeMs(1000);
} // namespace
ParticipantsBoxController::ParticipantsBoxController(
not_null<Window::Controller*> window,
not_null<ChannelData*> channel,
Role role)
: PeerListController(CreateSearchController(channel, role, &_additional))
, _window(window)
, _channel(channel)
, _role(role) {
if (_channel->mgInfo) {
@ -103,8 +106,14 @@ ParticipantsBoxController::CreateSearchController(
return nullptr;
}
void ParticipantsBoxController::Start(not_null<ChannelData*> channel, Role role) {
auto controller = std::make_unique<ParticipantsBoxController>(channel, role);
void ParticipantsBoxController::Start(
not_null<Window::Controller*> window,
not_null<ChannelData*> channel,
Role role) {
auto controller = std::make_unique<ParticipantsBoxController>(
window,
channel,
role);
auto initBox = [role, channel, controller = controller.get()](not_null<PeerListBox*> box) {
box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
auto canAddNewItem = [role, channel] {
@ -382,7 +391,7 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
} else if (_role == Role::Restricted || _role == Role::Kicked) {
showRestricted(user);
} else {
Ui::showPeerProfile(row->peer());
_window->showPeerInfo(row->peer());
}
}

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

@ -25,6 +25,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "base/timer.h"
#include "base/weak_unique_ptr.h"
namespace Window {
class Controller;
} // namespace Window
namespace Profile {
// Viewing admins, banned or restricted users list with search.
@ -41,7 +45,10 @@ public:
Restricted,
Kicked,
};
static void Start(not_null<ChannelData*> channel, Role role);
static void Start(
not_null<Window::Controller*> window,
not_null<ChannelData*> channel,
Role role);
struct Additional {
std::map<not_null<UserData*>, MTPChannelAdminRights> adminRights;
@ -55,7 +62,10 @@ public:
UserData *creator = nullptr;
};
ParticipantsBoxController(not_null<ChannelData*> channel, Role role);
ParticipantsBoxController(
not_null<Window::Controller*> window,
not_null<ChannelData*> channel,
Role role);
void addNewItem();
@ -93,6 +103,7 @@ private:
void refreshCustomStatus(not_null<PeerListRow*> row) const;
bool feedMegagroupLastParticipants();
not_null<Window::Controller*> _window;
not_null<ChannelData*> _channel;
Role _role = Role::Admins;
int _offset = 0;

14
Telegram/SourceFiles/profile/profile_common_groups_section.cpp
View File

@ -33,6 +33,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "observer_peer.h"
#include "apiwrap.h"
#include "lang/lang_keys.h"
#include "mainwindow.h"
#include "window/window_controller.h"
namespace Profile {
namespace CommonGroups {
@ -59,9 +61,7 @@ FixedBar::FixedBar(QWidget *parent) : TWidget(parent)
}
void FixedBar::onBack() {
App::main()->showBackFromStack(
anim::type::normal,
anim::activation::normal);
App::main()->showBackFromStack(Window::SectionShow());
}
int FixedBar::resizeGetHeight(int newWidth) {
@ -317,7 +317,9 @@ void InnerWidget::mouseReleaseEvent(QMouseEvent *e) {
ripple->lastStop();
}
if (pressed == _selected) {
Ui::showPeerHistory(_items[pressed]->peer, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
App::wnd()->controller()->showPeerHistory(
_items[pressed]->peer,
Window::SectionShow::Way::Forward);
}
}
setCursor(_selected ? style::cur_pointer : style::cur_default);
@ -382,7 +384,9 @@ void Widget::doSetInnerFocus() {
_inner->setFocus();
}
bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
bool Widget::showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
if (auto profileMemento = dynamic_cast<SectionMemento*>(memento.get())) {
if (profileMemento->getUser() == user()) {
restoreState(profileMemento);

4
Telegram/SourceFiles/profile/profile_common_groups_section.h
View File

@ -187,7 +187,9 @@ public:
QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
bool showInternal(not_null<Window::SectionMemento*> memento) override;
bool showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
std::unique_ptr<Window::SectionMemento> createMemento() override;
void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);

6
Telegram/SourceFiles/profile/profile_cover.cpp
View File

@ -39,6 +39,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "mainwindow.h"
#include "messenger.h"
#include "platform/platform_file_utilities.h"
#include "window/main_window.h"
#include "window/window_controller.h"
namespace Profile {
namespace {
@ -490,7 +492,9 @@ void CoverWidget::onOnlineCountUpdated(int onlineCount) {
}
void CoverWidget::onSendMessage() {
Ui::showPeerHistory(_peer, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
App::wnd()->controller()->showPeerHistory(
_peer,
Window::SectionShow::Way::Forward);
}
void CoverWidget::onShareContact() {

3
Telegram/SourceFiles/profile/profile_fixed_bar.cpp
View File

@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "observer_peer.h"
#include "styles/style_boxes.h"
#include "profile/profile_back_button.h"
#include "window/window_controller.h"
namespace Profile {
namespace {
@ -148,7 +149,7 @@ void FixedBar::addRightAction(RightActionType type, base::lambda<QString()> text
}
void FixedBar::onBack() {
App::main()->showBackFromStack(anim::type::normal, anim::activation::normal);
App::main()->showBackFromStack(Window::SectionShow());
}
void FixedBar::onEditChannel() {

4
Telegram/SourceFiles/profile/profile_widget.cpp
View File

@ -75,7 +75,9 @@ void Widget::doSetInnerFocus() {
_inner->setFocus();
}
bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
bool Widget::showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) {
if (auto profileMemento = dynamic_cast<SectionMemento*>(memento.get())) {
if (profileMemento->getPeer() == peer()) {
restoreState(profileMemento);

4
Telegram/SourceFiles/profile/profile_widget.h
View File

@ -47,7 +47,9 @@ public:
QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
bool showInternal(not_null<Window::SectionMemento*> memento) override;
bool showInternal(
not_null<Window::SectionMemento*> memento,
const Window::SectionShow &params) override;
std::unique_ptr<Window::SectionMemento> createMemento() override;
void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);

16
Telegram/SourceFiles/rpl/producer.h
View File

@ -534,8 +534,8 @@ inline void operator|(
lifetime_with_none &&lifetime) {
lifetime.alive_while.add(
std::move(value).start(
[](const Value&) {},
[](const Error&) {},
[] {},
[] {},
[] {}));
}
@ -551,7 +551,7 @@ inline void operator|(
lifetime.alive_while.add(
std::move(value).start(
std::move(lifetime.next),
[](const Error&) {},
[] {},
[] {}));
}
@ -566,7 +566,7 @@ inline void operator|(
lifetime_with_error<OnError> &&lifetime) {
lifetime.alive_while.add(
std::move(value).start(
[](const Value&) {},
[] {},
std::move(lifetime.error),
[] {}));
}
@ -582,8 +582,8 @@ inline void operator|(
lifetime_with_done<OnDone> &&lifetime) {
lifetime.alive_while.add(
std::move(value).start(
[](const Value&) {},
[](const Error&) {},
[] {},
[] {},
std::move(lifetime.done)));
}
@ -620,7 +620,7 @@ inline void operator|(
lifetime_with_error_done<OnError, OnDone> &&lifetime) {
lifetime.alive_while.add(
std::move(value).start(
[](const Value&) {},
[] {},
std::move(lifetime.error),
std::move(lifetime.done)));
}
@ -640,7 +640,7 @@ inline void operator|(
lifetime.alive_while.add(
std::move(value).start(
std::move(lifetime.next),
[](const Error&) {},
[] {},
std::move(lifetime.done)));
}

4
Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
View File

@ -143,7 +143,9 @@ void BlockedBoxController::loadMoreRows() {
}
void BlockedBoxController::rowClicked(not_null<PeerListRow*> row) {
Ui::showPeerHistoryAsync(row->peer()->id, ShowAtUnreadMsgId);
InvokeQueued(App::main(), [peerId = row->peer()->id] {
Ui::showPeerHistory(peerId, ShowAtUnreadMsgId);
});
}
void BlockedBoxController::rowActionClicked(not_null<PeerListRow*> row) {

6
Telegram/SourceFiles/ui/abstract_button.h
View File

@ -59,6 +59,12 @@ public:
auto clicks() const {
return _clicks.events();
}
template <typename Handler>
void addClickHandler(Handler &&handler) {
clicks() | rpl::start_with_next(
std::forward<Handler>(handler),
lifetime());
}
protected:
void enterEventHook(QEvent *e) override;

13
Telegram/SourceFiles/ui/effects/fade_animation.cpp
View File

@ -54,12 +54,21 @@ void FadeAnimation::refreshCache() {
if (!_cache.isNull()) {
_cache = QPixmap();
_cache = grabContent();
Assert(!_cache.isNull());
}
}
QPixmap FadeAnimation::grabContent() {
myEnsureResized(_widget);
_size = _widget->size();
if (_size.isEmpty()) {
auto image = QImage(
cIntRetinaFactor(),
cIntRetinaFactor(),
QImage::Format_ARGB32_Premultiplied);
image.fill(Qt::transparent);
return App::pixmapFromImageInPlace(std::move(image));
}
auto widgetContent = myGrab(_widget);
if (!_scaled) {
return widgetContent;
@ -109,6 +118,9 @@ void FadeAnimation::stopAnimation() {
}
if (_visible == _widget->isHidden()) {
_widget->setVisible(_visible);
if (_visible) {
_widget->showChildren();
}
}
}
@ -130,6 +142,7 @@ void FadeAnimation::startAnimation(int duration) {
if (_cache.isNull()) {
_widget->showChildren();
_cache = grabContent();
Assert(!_cache.isNull());
_widget->hideChildren();
}
auto from = _visible ? 0. : 1.;

3
Telegram/SourceFiles/ui/wrap/fade_wrap.cpp
View File

@ -31,6 +31,9 @@ FadeWrap<RpWidget>::FadeWrap(
: Parent(parent, std::move(child))
, _duration(st::fadeWrapDuration)
, _animation(this, scaled) {
if (auto weak = wrapped()) {
weak->show();
}
}
FadeWrap<RpWidget> *FadeWrap<RpWidget>::setDuration(int duration) {

9
Telegram/SourceFiles/window/layer_widget.cpp
View File

@ -635,6 +635,15 @@ void LayerStackWidget::showSpecialLayer(
}, Action::ShowSpecialLayer, animated);
}
bool LayerStackWidget::showSectionInternal(
not_null<Window::SectionMemento *> memento,
const SectionShow &params) {
if (_specialLayer) {
return _specialLayer->showSectionInternal(memento, params);
}
return false;
}
void LayerStackWidget::hideSpecialLayer(anim::type animated) {
startAnimation([] {}, [this] {
clearSpecialLayer();

11
Telegram/SourceFiles/window/layer_widget.h
View File

@ -26,6 +26,8 @@ namespace Window {
class MainMenu;
class Controller;
class SectionMemento;
struct SectionShow;
class LayerWidget : public Ui::RpWidget {
public:
@ -55,6 +57,11 @@ public:
virtual bool takeToThirdSection() {
return false;
}
virtual bool showSectionInternal(
not_null<SectionMemento*> memento,
const SectionShow &params) {
return false;
}
protected:
void closeLayer() {
@ -119,6 +126,10 @@ public:
void hideAll(anim::type animated);
void hideTopLayer(anim::type animated);
bool showSectionInternal(
not_null<SectionMemento*> memento,
const SectionShow &params);
bool layerShown() const;
~LayerStackWidget();

5
Telegram/SourceFiles/window/section_widget.cpp
View File

@ -20,9 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include "window/section_widget.h"
#include <rpl/range.h>
#include "application.h"
#include "window/section_memento.h"
#include <rpl/range.h>
#include "window/window_slide_animation.h"
namespace Window {
@ -105,4 +106,6 @@ rpl::producer<int> SectionWidget::desiredHeight() const {
return rpl::single(height());
}
SectionWidget::~SectionWidget() = default;
} // namespace Window

14
Telegram/SourceFiles/window/section_widget.h
View File

@ -21,12 +21,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#pragma once
#include "ui/rp_widget.h"
#include "window/window_slide_animation.h"
namespace Window {
class Controller;
class LayerWidget;
class SlideAnimation;
struct SectionShow;
enum class SlideDirection;
enum class Column {
First,
@ -93,7 +95,9 @@ public:
virtual bool forceAnimateBack() const {
return false;
}
void showAnimated(SlideDirection direction, const SectionSlideParams &params);
void showAnimated(
SlideDirection direction,
const SectionSlideParams &params);
void showFast();
// This can be used to grab with or without top bar shadow.
@ -108,7 +112,9 @@ public:
//
// If this method returns false it is not supposed to modify the memento.
// If this method returns true it may modify the memento ("take" heavy items).
virtual bool showInternal(not_null<SectionMemento*> memento) = 0;
virtual bool showInternal(
not_null<SectionMemento*> memento,
const SectionShow &params) = 0;
// Create a memento of that section to store it in the history stack.
// This method may modify the section ("take" heavy items).
@ -156,6 +162,8 @@ protected:
return _showAnimation != nullptr;
}
~SectionWidget();
private:
void showFinished();

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

@ -251,89 +251,70 @@ void Controller::updateColumnLayout() {
void Controller::showPeerHistory(
PeerId peerId,
Ui::ShowWay way,
MsgId msgId,
anim::type animated,
anim::activation activation) {
Ui::showPeerHistory(
const SectionShow &params,
MsgId msgId) {
App::main()->ui_showPeerHistory(
peerId,
msgId,
way,
animated,
activation);
params,
msgId);
}
void Controller::showPeerHistory(
not_null<PeerData*> peer,
Ui::ShowWay way,
MsgId msgId,
anim::type animated,
anim::activation activation) {
const SectionShow &params,
MsgId msgId) {
showPeerHistory(
peer->id,
way,
msgId,
animated,
activation);
params,
msgId);
}
void Controller::showPeerHistory(
not_null<History*> history,
Ui::ShowWay way,
MsgId msgId,
anim::type animated,
anim::activation activation) {
const SectionShow &params,
MsgId msgId) {
showPeerHistory(
history->peer->id,
way,
msgId,
animated,
activation);
params,
msgId);
}
void Controller::showPeerInfo(
PeerId peerId,
anim::type animated,
anim::activation activation) {
const SectionShow &params) {
if (Adaptive::ThreeColumn()
&& !Auth().data().thirdSectionInfoEnabled()) {
Auth().data().setThirdSectionInfoEnabled(true);
Auth().saveDataDelayed();
}
showSection(
Info::Memento(peerId),
animated,
activation);
showSection(Info::Memento(peerId), params);
}
void Controller::showPeerInfo(
not_null<PeerData*> peer,
anim::type animated,
anim::activation activation) {
showPeerInfo(peer->id, animated, activation);
const SectionShow &params) {
showPeerInfo(peer->id, params);
}
void Controller::showPeerInfo(
not_null<History*> history,
anim::type animated,
anim::activation activation) {
showPeerInfo(history->peer->id, animated, activation);
const SectionShow &params) {
showPeerInfo(history->peer->id, params);
}
void Controller::showSection(
SectionMemento &&memento,
anim::type animated,
anim::activation activation) {
App::main()->showSection(
std::move(memento),
animated,
activation);
const SectionShow &params) {
if (App::wnd()->showSectionInExistingLayer(
&memento,
params)) {
return;
}
App::main()->showSection(std::move(memento), params);
}
void Controller::showBackFromStack(
anim::type animated,
anim::activation activation) {
chats()->showBackFromStack(animated, activation);
void Controller::showBackFromStack(const SectionShow &params) {
chats()->showBackFromStack(params);
}
void Controller::showSpecialLayer(

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

@ -38,6 +38,37 @@ enum class GifPauseReason {
using GifPauseReasons = base::flags<GifPauseReason>;
inline constexpr bool is_flag_type(GifPauseReason) { return true; };
struct SectionShow {
enum class Way {
Forward,
Backward,
ClearStack,
};
SectionShow(
Way way = Way::ClearStack,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal)
: way(way)
, animated(animated)
, activation(activation) {
}
SectionShow(
anim::type animated,
anim::activation activation = anim::activation::normal)
: animated(animated)
, activation(activation) {
}
SectionShow withWay(Way newWay) const {
return SectionShow(newWay, animated, activation);
}
Way way = Way::Forward;
anim::type animated = anim::type::normal;
anim::activation activation = anim::activation::normal;
};
class MainWindow;
class SectionMemento;
@ -87,13 +118,44 @@ public:
bool takeThirdSectionFromLayer();
void resizeForThirdSection();
void closeThirdSection();
void showSection(
SectionMemento &&memento,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
const SectionShow &params = SectionShow());
void showBackFromStack(
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
const SectionShow &params = SectionShow());
void showPeerHistory(
PeerId peerId,
const SectionShow &params = SectionShow(),
MsgId msgId = ShowAtUnreadMsgId);
void showPeerHistory(
not_null<PeerData*> peer,
const SectionShow &params = SectionShow(),
MsgId msgId = ShowAtUnreadMsgId);
void showPeerHistory(
not_null<History*> history,
const SectionShow &params = SectionShow(),
MsgId msgId = ShowAtUnreadMsgId);
void showPeerInfo(
PeerId peerId,
const SectionShow &params = SectionShow::Way::Forward);
void showPeerInfo(
not_null<PeerData*> peer,
const SectionShow &params = SectionShow::Way::Forward);
void showPeerInfo(
not_null<History*> history,
const SectionShow &params = SectionShow::Way::Forward);
void clearSectionStack(
const SectionShow &params = SectionShow::Way::ClearStack) {
showPeerHistory(
PeerId(0),
params,
ShowAtUnreadMsgId);
}
void showSpecialLayer(
object_ptr<LayerWidget> &&layer,
anim::type animated = anim::type::normal);
@ -102,49 +164,6 @@ public:
showSpecialLayer(nullptr, animated);
}
void showPeerHistory(
PeerId peerId,
Ui::ShowWay way = Ui::ShowWay::ClearStack,
MsgId msgId = ShowAtUnreadMsgId,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerHistory(
not_null<PeerData*> peer,
Ui::ShowWay way = Ui::ShowWay::ClearStack,
MsgId msgId = ShowAtUnreadMsgId,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerHistory(
not_null<History*> history,
Ui::ShowWay way = Ui::ShowWay::ClearStack,
MsgId msgId = ShowAtUnreadMsgId,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerInfo(
PeerId peerId,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerInfo(
not_null<PeerData*> peer,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void showPeerInfo(
not_null<History*> history,
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal);
void clearSectionStack(
anim::type animated = anim::type::normal,
anim::activation activation = anim::activation::normal) {
showPeerHistory(
PeerId(0),
Ui::ShowWay::ClearStack,
ShowAtUnreadMsgId,
animated,
activation);
}
void showJumpToDate(
not_null<PeerData*> peer,
QDate requestedDate);