void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 07:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed label from confirm box when text is not provided.

Browse source
This commit is contained in:
23rd 2022-04-15 12:36:06 +03:00
parent 64627c9093
commit 0427f90649
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Telegram/SourceFiles/ui/boxes/confirm_box.cpp
View file

@ -17,12 +17,18 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
const auto weak = Ui::MakeWeak(box); const auto weak = Ui::MakeWeak(box);
const auto lifetime = box->lifetime().make_state<rpl::lifetime>(); const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
const auto label = box->addRow( v::match(args.text, [](v::null_t) {
object_ptr<Ui::FlatLabel>( }, [&](auto &&) {
box.get(), const auto label = box->addRow(
v::text::take_marked(std::move(args.text)), object_ptr<Ui::FlatLabel>(
args.labelStyle ? *args.labelStyle : st::boxLabel), box.get(),
st::boxPadding); v::text::take_marked(std::move(args.text)),
args.labelStyle ? *args.labelStyle : st::boxLabel),
st::boxPadding);
if (args.labelFilter) {
label->setClickHandlerFilter(std::move(args.labelFilter));
}
});
const auto prepareCallback = [&](ConfirmBoxArgs::Callback &callback) { const auto prepareCallback = [&](ConfirmBoxArgs::Callback &callback) {
return [=, confirmed = std::move(callback)]() { return [=, confirmed = std::move(callback)]() {
@ -75,9 +81,6 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
}), *lifetime); }), *lifetime);
} }
if (args.labelFilter) {
label->setClickHandlerFilter(std::move(args.labelFilter));
}
if (args.strictCancel) { if (args.strictCancel) {
lifetime->destroy(); lifetime->destroy();
} }

2
Telegram/SourceFiles/ui/boxes/confirm_box.h
View file

@ -18,7 +18,7 @@ struct ConfirmBoxArgs {
Fn<void()>, Fn<void()>,
Fn<void(Fn<void()>)>>; Fn<void(Fn<void()>)>>;
v::text::data text; v::text::data text = v::null;
Callback confirmed = v::null; Callback confirmed = v::null;
Callback cancelled = v::null; Callback cancelled = v::null;