mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Allow several lines in QR code intro step phrases.

Browse Source
This commit is contained in:
John Preston
2019-12-31 11:56:41 +03:00
parent 6db4222b1b
commit 03ff48cf07
5 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/intro/intro_widget.cpp
View File

@@ -224,6 +224,7 @@ void Widget::historyMove(Direction direction) {
_coverShownAnimation.start([this] { updateControlsGeometry(); }, 0., 1., st::introCoverDuration, wasStep->hasCover() ? anim::linear : anim::easeOutCirc);
}
_stepLifetime.destroy();
if (direction == Direction::Forward || direction == Direction::Replace) {
wasStep->finished();
}
@@ -521,13 +522,10 @@ void Widget::setupNextButton() {
) | rpl::filter([](const QString &text) {
return !text.isEmpty();
}));
auto visible = getStep()->nextButtonText(
getStep()->nextButtonText(
) | rpl::map([](const QString &text) {
return !text.isEmpty();
});
std::move(
visible
) | rpl::filter([=](bool visible) {
}) | rpl::filter([=](bool visible) {
return visible != _nextShown;
}) | rpl::start_with_next([=](bool visible) {
_next->toggle(visible, anim::type::normal);
@@ -542,7 +540,7 @@ void Widget::setupNextButton() {
_nextShown ? 0. : 1.,
_nextShown ? 1. : 0.,
st::slideDuration);
}, getStep()->lifetime());
}, _stepLifetime);
}
void Widget::hideControls() {