procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Revert "Workaround build issues on GCC."

Browse source 
This reverts commit 3defb06783.
This commit is contained in:
John Preston 2021-03-17 22:13:23 +04:00
parent 6f86ce595b
commit 348b4d54ba
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/calls/calls_group_panel.cpp
View file

@ -609,13 +609,13 @@ void Panel::setupJoinAsChangedToasts() {
return (state == State::Joined);
}) | rpl::take(1);
}) | rpl::flatten_latest() | rpl::start_with_next([=] {
Ui::ShowMultilineToast(Ui::MultilineToastArgs{
Ui::ShowMultilineToast({
.parentOverride = widget(),
.text = tr::lng_group_call_join_as_changed(
tr::now,
lt_name,
Ui::Text::Bold(_call->joinAs()->name),
Ui::Text::WithEntities),
.parentOverride = widget(),
});
}, widget()->lifetime());
}
@ -629,13 +629,13 @@ void Panel::setupTitleChangedToasts() {
? _peer->name
: _peer->groupCall()->title();
}) | rpl::start_with_next([=](const QString &title) {
Ui::ShowMultilineToast(Ui::MultilineToastArgs{
Ui::ShowMultilineToast({
.parentOverride = widget(),
.text = tr::lng_group_call_title_changed(
tr::now,
lt_title,
Ui::Text::Bold(title),
Ui::Text::WithEntities),
.parentOverride = widget(),
});
}, widget()->lifetime());
}

2
Telegram/SourceFiles/ui/toasts/common_toasts.h
View file

@ -12,9 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Ui {
struct MultilineToastArgs {
QWidget *parentOverride = nullptr;
TextWithEntities text;
crl::time duration = 0;
QWidget *parentOverride = nullptr;
};
void ShowMultilineToast(MultilineToastArgs &&args);