Use new toast style structure.

Telegram/SourceFiles/chat_helpers/chat_helpers.style

@@ -218,8 +218,11 @@ stickerGroupCategoryAbout: defaultTextStyle;
 stickerGroupCategoryAddMargin: margins(0px, 10px, 0px, 5px);
 stickerGroupCategoryAdd: stickersTrendingAdd;
 
-stickersToastMaxWidth: 340px;
+stickersToast: Toast(defaultToast) {
-stickersToastPadding: margins(16px, 13px, 16px, 12px);
+	minWidth: 340px;
+	maxWidth: 340px;
+	padding: margins(16px, 13px, 16px, 12px);
+}
 
 stickersEmpty: icon {{ "stickers_empty", windowSubTextFg }};
 

Telegram/SourceFiles/chat_helpers/stickers.cpp

@@ -77,12 +77,11 @@ void ApplyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d) {
 	Local::writeInstalledStickers();
 	Local::writeArchivedStickers();
 
-	auto toast = Ui::Toast::Config();
+	Ui::Toast::Show(Ui::Toast::Config{
-	toast.text = { tr::lng_stickers_packs_archived(tr::now) };
+		.text = { tr::lng_stickers_packs_archived(tr::now) },
-	toast.maxWidth = toast.minWidth = st::stickersToastMaxWidth;
+		.st = &st::stickersToast,
-	toast.multiline = true;
+		.multiline = true,
-	toast.padding = st::stickersToastPadding;
+	});
-	Ui::Toast::Show(toast);
 //	Ui::show(Box<StickersBox>(archived, &Auth()), Ui::LayerOption::KeepOther);
 
 	Auth().data().notifyStickersUpdated();

Telegram/SourceFiles/history/history.style

@@ -379,6 +379,17 @@ botKbTinyButton: BotKeyboardButton {
 botKbScroll: defaultSolidScroll;
 
 historyDateFadeDuration: 200;
+historyDiceToast: Toast(defaultToast) {
+	minWidth: msgMinWidth;
+	maxWidth: 640px;
+}
+historyErrorToast: Toast(defaultToast) {
+	minWidth: msgMinWidth;
+}
+historyInfoToast: Toast(defaultToast) {
+	minWidth: msgMinWidth;
+	maxWidth: 380px;
+}
 
 historyPhotoLeft: 14px;
 historyPhotoBubbleMinWidth: 200px;

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -2484,19 +2484,18 @@ void HistoryInner::elementStartStickerLoop(
 }
 
 void HistoryInner::elementShowPollResults(
-		not_null<PollData*> poll,
+	not_null<PollData*> poll,
-		FullMsgId context) {
+	FullMsgId context) {
-	_controller->showPollResults(poll, context);
 }
 
 void HistoryInner::elementShowTooltip(const TextWithEntities &text) {
-	auto config = Ui::Toast::Config();
+	Ui::Toast::Show(_widget, Ui::Toast::Config{
-	config.multiline = config.dark = true;
+		.text = text,
-	config.minWidth = st::msgMinWidth;
+		.st = &st::historyInfoToast,
-	config.maxWidth = st::windowMinWidth;
+		.durationMs = CountToastDuration(text),
-	config.text = text;
+		.multiline = true,
-	config.durationMs = CountToastDuration(config.text);
+		.dark = true,
-	Ui::Toast::Show(_widget, config);
+	});
 }
 
 auto HistoryInner::getSelectionState() const

Telegram/SourceFiles/history/history_widget.cpp

@@ -236,11 +236,11 @@ object_ptr<Ui::FlatButton> SetupDiscussButton(
 }
 
 void ShowErrorToast(const QString &text) {
-	auto config = Ui::Toast::Config();
+	Ui::Toast::Show(Ui::Toast::Config{
-	config.multiline = true;
+		.text = { text },
-	config.minWidth = st::msgMinWidth;
+		.st = &st::historyErrorToast,
-	config.text = { text };
+		.multiline = true,
-	Ui::Toast::Show(config);
+	});
 }
 
 } // namespace

Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp

@@ -48,11 +48,11 @@ namespace HistoryView {
 namespace {
 
 void ShowErrorToast(const QString &text) {
-	auto config = Ui::Toast::Config();
+	Ui::Toast::Show(Ui::Toast::Config{
-	config.multiline = true;
+		.text = { text },
-	config.minWidth = st::msgMinWidth;
+		.st = &st::historyErrorToast,
-	config.text = { text };
+		.multiline = true,
-	Ui::Toast::Show(config);
+	});
 }
 
 } // namespace

Telegram/SourceFiles/history/view/media/history_view_dice.cpp

@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "styles/style_history.h"
 
 namespace HistoryView {
 namespace {
@@ -35,12 +36,12 @@ namespace {
 		not_null<History*> history,
 		const QString &emoji) {
 	return std::make_shared<LambdaClickHandler>([=] {
-		auto config = Ui::Toast::Config();
+		auto config = Ui::Toast::Config{
-		config.multiline = true;
+			.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
-		config.minWidth = st::msgMinWidth;
+			.st = &st::historyDiceToast,
-		config.maxWidth = st::toastMaxWidth + st::msgMinWidth;
+			.durationMs = Ui::Toast::kDefaultDuration * 2,
-		config.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) };
+			.multiline = true,
-		config.durationMs = Ui::Toast::kDefaultDuration * 2;
+		};
 		auto link = Ui::Text::Link(
 			tr::lng_about_random_send(tr::now).toUpper());
 		link.entities.push_back(

Telegram/SourceFiles/passport/passport_form_controller.cpp

@@ -759,9 +759,9 @@ std::vector<not_null<const Value*>> FormController::submitGetErrors() {
 		_view->showToast(tr::lng_passport_success(tr::now));
 
 		base::call_delayed(
-			(st::toastFadeInDuration
+			(st::defaultToast.durationFadeIn
 				+ Ui::Toast::kDefaultDuration
-				+ st::toastFadeOutDuration),
+				+ st::defaultToast.durationFadeOut),
 			this,
 			[=] { cancel(); });
 	}).fail([=](const RPCError &error) {

Telegram/SourceFiles/settings/settings_privacy_controllers.cpp

@@ -828,7 +828,7 @@ void ForwardsPrivacyController::PaintForwardedTooltip(
 		}
 		Unexpected("Option value in ForwardsPrivacyController.");
 	}();
-	const auto &font = st::toastTextStyle.font;
+	const auto &font = st::defaultToast.style.font;
 	const auto textWidth = font->width(text);
 	const auto arrowSkip = st::settingsForwardPrivacyArrowSkip;
 	const auto arrowSize = st::settingsForwardPrivacyArrowSize;

Telegram/SourceFiles/window/window.style

@@ -310,6 +310,11 @@ windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) {
 windowFilterChatsSectionSubtitlePadding: margins(17px, 7px, 17px, 7px);
 windowFilterAboutPadding: margins(22px, 0px, 22px, 19px);
 
+windowArchiveToast: Toast(defaultToast) {
+	minWidth: boxWideWidth;
+	maxWidth: boxWideWidth;
+}
+
 // Mac specific
 
 macAccessoryWidth: 450.;

Telegram/SourceFiles/window/window_peer_menu.cpp

@@ -53,6 +53,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_window.h" // st::windowMinWidth
+#include "styles/style_history.h" // st::historyErrorToast
 
 #include <QtWidgets/QAction>
 
@@ -654,12 +655,12 @@ void FolderFiller::addTogglesForArchive() {
 	});
 
 	_addAction(tr::lng_context_archive_to_menu(tr::now), [=] {
-		auto toast = Ui::Toast::Config();
+		Ui::Toast::Show(Ui::Toast::Config{
-		toast.text = { tr::lng_context_archive_to_menu_info(tr::now) };
+			.text = { tr::lng_context_archive_to_menu_info(tr::now) },
-		toast.minWidth = toast.maxWidth = st::boxWideWidth;
+			.st = &st::windowArchiveToast,
-		toast.multiline = true;
+			.durationMs = kArchivedToastDuration,
-		toast.durationMs = kArchivedToastDuration;
+			.multiline = true,
-		Ui::Toast::Show(toast);
+		});
 
 		controller->session().settings().setArchiveInMainMenu(
 			!controller->session().settings().archiveInMainMenu());
@@ -949,11 +950,11 @@ QPointer<Ui::RpWidget> ShowSendNowMessagesBox(
 		session->data().idsToItems(items),
 		TextWithTags());
 	if (!error.isEmpty()) {
-		auto config = Ui::Toast::Config();
+		Ui::Toast::Show(Ui::Toast::Config{
-		config.multiline = true;
+			.text = { error },
-		config.minWidth = st::msgMinWidth;
+			.st = &st::historyErrorToast,
-		config.text = { error };
+			.multiline = true,
-		Ui::Toast::Show(config);
+		});
 		return { nullptr };
 	}
 	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
@@ -1060,16 +1061,16 @@ void PeerMenuAddMuteAction(
 //
 void ToggleHistoryArchived(not_null<History*> history, bool archived) {
 	const auto callback = [=] {
-		auto toast = Ui::Toast::Config();
+		Ui::Toast::Show(Ui::Toast::Config{
-		toast.text = { archived
+			.text = { (archived
-			? tr::lng_archived_added(tr::now)
+				? tr::lng_archived_added(tr::now)
-			: tr::lng_archived_removed(tr::now) };
+				: tr::lng_archived_removed(tr::now)) },
-		toast.minWidth = toast.maxWidth = st::boxWideWidth;
+			.st = &st::windowArchiveToast,
-		toast.multiline = true;
+			.durationMs = (archived
-		if (archived) {
+				? kArchivedToastDuration
-			toast.durationMs = kArchivedToastDuration;
+				: Ui::Toast::kDefaultDuration),
-		}
+			.multiline = true,
-		Ui::Toast::Show(toast);
+		});
 	};
 	history->session().api().toggleHistoryArchived(
 		history,

Telegram/lib_ui

@@ -1 +1 @@
-Subproject commit 1647b0b76a3352f5d9b2892441eeaf002256a481
+Subproject commit 48a83157407c555d3a0c17026aced41308138d49