mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Detach ComposeControls from SessionController.

Browse Source
This commit is contained in:
John Preston
2023-05-02 13:33:19 +04:00
parent 665467b02d
commit 65afa2c402
178 changed files with 2080 additions and 1869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/data/data_media_types.cpp
View File

@@ -62,7 +62,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/click_handler_types.h" // ClickHandlerContext
#include "lang/lang_keys.h"
#include "storage/file_upload.h"
#include "window/window_session_controller.h" // Window::Show
#include "window/window_session_controller.h" // SessionController::uiShow.
#include "apiwrap.h"
#include "styles/style_chat.h"
#include "styles/style_dialogs.h"
@@ -1828,7 +1828,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
auto config = Ui::Toast::Config{
.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
.st = &st::historyDiceToast,
.durationMs = Ui::Toast::kDefaultDuration * 2,
.duration = Ui::Toast::kDefaultDuration * 2,
.multiline = true,
};
if (CanSend(history->peer, ChatRestriction::SendOther)) {
@@ -1857,9 +1857,7 @@ ClickHandlerPtr MediaDice::MakeHandler(
const auto my = context.other.value<ClickHandlerContext>();
const auto weak = my.sessionWindow;
if (const auto strong = weak.get()) {
ShownToast = Ui::Toast::Show(
Window::Show(strong).toastParent(),
config);
ShownToast = strong->showToast(std::move(config));
} else {
ShownToast = Ui::Toast::Show(config);
}

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

@@ -39,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/image/image.h"
#include "ui/empty_userpic.h"
#include "ui/text/text_options.h"
#include "ui/toasts/common_toasts.h"
#include "ui/painter.h"
#include "ui/ui_utility.h"
#include "history/history.h"

48
Telegram/SourceFiles/data/stickers/data_stickers.cpp
View File

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/stickers/data_stickers.h"
#include "api/api_hash.h"
#include "chat_helpers/compose/compose_show.h"
#include "data/data_document.h"
#include "data/data_session.h"
#include "data/data_user.h"
@@ -29,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_app_config.h"
#include "mtproto/mtproto_config.h"
#include "ui/toast/toast.h"
#include "ui/toasts/common_toasts.h"
#include "ui/image/image_location_factory.h"
#include "window/window_controller.h"
#include "window/window_session_controller.h"
@@ -78,24 +78,24 @@ using SetFlag = StickersSetFlag;
}
void MaybeShowPremiumToast(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
TextWithEntities text,
const QString &ref) {
if (!controller) {
if (!show) {
return;
}
const auto session = &controller->session();
const auto session = &show->session();
if (session->user()->isPremium()) {
return;
}
const auto widget = QPointer<Ui::RpWidget>(
controller->window().widget()->bodyWidget());
const auto filter = [=](const auto ...) {
Settings::ShowPremium(controller, ref);
const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
if (const auto controller = show->resolveWindow(usage)) {
Settings::ShowPremium(controller, ref);
}
return false;
};
Ui::ShowMultilineToast({
.parentOverride = widget,
show->showToast({
.text = std::move(text),
.duration = kPremiumToastDuration,
.filter = filter,
@@ -313,7 +313,7 @@ void Stickers::incrementSticker(not_null<DocumentData*> document) {
}
void Stickers::addSavedGif(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document) {
const auto index = _savedGifs.indexOf(document);
if (!index) {
@@ -328,7 +328,7 @@ void Stickers::addSavedGif(
if (_savedGifs.size() > limits.gifsCurrent()) {
_savedGifs.pop_back();
MaybeShowPremiumToast(
controller,
show,
SavedGifsToast(limits),
LimitsPremiumRef("saved_gifs"));
}
@@ -518,7 +518,7 @@ bool Stickers::isFaved(not_null<const DocumentData*> document) {
void Stickers::checkFavedLimit(
StickersSet &set,
Window::SessionController *controller) {
std::shared_ptr<ChatHelpers::Show> show) {
const auto session = &_owner->session();
const auto limits = Data::PremiumLimits(session);
if (set.stickers.size() <= limits.stickersFavedCurrent()) {
@@ -538,21 +538,21 @@ void Stickers::checkFavedLimit(
++i;
}
MaybeShowPremiumToast(
controller,
std::move(show),
FaveStickersToast(limits),
LimitsPremiumRef("stickers_faved"));
}
void Stickers::pushFavedToFront(
StickersSet &set,
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
const std::vector<not_null<EmojiPtr>> &emojiList) {
set.stickers.push_front(document);
for (auto emoji : emojiList) {
set.emoji[emoji].push_front(document);
}
checkFavedLimit(set, controller);
checkFavedLimit(set, std::move(show));
}
void Stickers::moveFavedToFront(StickersSet &set, int index) {
@@ -575,7 +575,7 @@ void Stickers::moveFavedToFront(StickersSet &set, int index) {
}
void Stickers::setIsFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
std::optional<std::vector<not_null<EmojiPtr>>> emojiList) {
auto &sets = setsRef();
@@ -600,11 +600,11 @@ void Stickers::setIsFaved(
if (index > 0) {
moveFavedToFront(*set, index);
} else if (emojiList) {
pushFavedToFront(*set, controller, document, *emojiList);
pushFavedToFront(*set, show, document, *emojiList);
} else if (auto list = getEmojiListFromSet(document)) {
pushFavedToFront(*set, controller, document, *list);
pushFavedToFront(*set, show, document, *list);
} else {
requestSetToPushFaved(controller, document);
requestSetToPushFaved(show, document);
return;
}
session().local().writeFavedStickers();
@@ -613,10 +613,8 @@ void Stickers::setIsFaved(
}
void Stickers::requestSetToPushFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document) {
controller = nullptr;
const auto weak = base::make_weak(controller);
auto addAnyway = [=](std::vector<not_null<EmojiPtr>> list) {
if (list.empty()) {
if (auto sticker = document->sticker()) {
@@ -625,7 +623,7 @@ void Stickers::requestSetToPushFaved(
}
}
}
setIsFaved(weak.get(), document, std::move(list));
setIsFaved(nullptr, document, std::move(list));
};
session().api().request(MTPmessages_GetStickerSet(
Data::InputStickerSet(document->sticker()->set),
@@ -668,11 +666,11 @@ void Stickers::setIsNotFaved(not_null<DocumentData*> document) {
}
void Stickers::setFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
bool faved) {
if (faved) {
setIsFaved(controller, document);
setIsFaved(std::move(show), document);
} else {
setIsNotFaved(document);
}

16
Telegram/SourceFiles/data/stickers/data_stickers.h
View File

@@ -22,6 +22,10 @@ namespace Window {
class SessionController;
} // namespace Window
namespace ChatHelpers {
class Show;
} // namespace ChatHelpers
namespace Data {
class Session;
@@ -200,7 +204,7 @@ public:
void removeFromRecentSet(not_null<DocumentData*> document);
void addSavedGif(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document);
void checkSavedGif(not_null<HistoryItem*> item);
@@ -210,7 +214,7 @@ public:
void undoInstallLocally(uint64 setId);
bool isFaved(not_null<const DocumentData*> document);
void setFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
bool faved);
@@ -260,21 +264,21 @@ private:
}
void checkFavedLimit(
StickersSet &set,
Window::SessionController *controller = nullptr);
std::shared_ptr<ChatHelpers::Show> show);
void setIsFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
std::optional<std::vector<not_null<EmojiPtr>>> emojiList
= std::nullopt);
void setIsNotFaved(not_null<DocumentData*> document);
void pushFavedToFront(
StickersSet &set,
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document,
const std::vector<not_null<EmojiPtr>> &emojiList);
void moveFavedToFront(StickersSet &set, int index);
void requestSetToPushFaved(
Window::SessionController *controller,
std::shared_ptr<ChatHelpers::Show> show,
not_null<DocumentData*> document);
void setPackAndEmoji(
StickersSet &set,