From 086e46c162e469f0b3d5b43849ffcd69487fd57d Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 27 Sep 2017 11:43:35 +0300 Subject: [PATCH] Add and use only rpl::start_with_*() methods. --- .../SourceFiles/boxes/edit_privacy_box.cpp | 2 +- .../SourceFiles/boxes/notifications_box.cpp | 4 +- Telegram/SourceFiles/boxes/peer_list_box.cpp | 4 +- .../SourceFiles/boxes/sticker_set_box.cpp | 2 +- Telegram/SourceFiles/boxes/stickers_box.cpp | 4 +- .../SourceFiles/chat_helpers/tabbed_panel.cpp | 2 +- .../chat_helpers/tabbed_selector.cpp | 9 +- Telegram/SourceFiles/data/data_peer.cpp | 2 +- .../history/history_shared_media.cpp | 18 +- .../history/history_user_photos.cpp | 6 +- Telegram/SourceFiles/info/info_layer_wrap.cpp | 6 +- Telegram/SourceFiles/info/info_memento.cpp | 5 +- .../SourceFiles/info/info_narrow_wrap.cpp | 2 +- Telegram/SourceFiles/info/info_side_wrap.cpp | 4 +- Telegram/SourceFiles/info/info_top_bar.cpp | 2 +- .../info/profile/info_profile_button.cpp | 6 +- .../info/profile/info_profile_cover.cpp | 16 +- .../info/profile/info_profile_icon.cpp | 2 +- .../profile/info_profile_inner_widget.cpp | 16 +- .../info/profile/info_profile_members.cpp | 18 +- .../info/profile/info_profile_widget.cpp | 2 +- Telegram/SourceFiles/mainwidget.cpp | 6 +- Telegram/SourceFiles/mediaview.cpp | 6 +- Telegram/SourceFiles/rpl/event_stream.h | 2 +- Telegram/SourceFiles/rpl/operators_tests.cpp | 69 +- Telegram/SourceFiles/rpl/producer.h | 1115 ++++------------- Telegram/SourceFiles/rpl/producer_tests.cpp | 122 +- Telegram/SourceFiles/rpl/variable.h | 4 +- .../settings/settings_block_widget.cpp | 2 +- .../settings/settings_inner_widget.cpp | 2 +- .../SourceFiles/settings/settings_layer.cpp | 4 +- .../settings/settings_scale_widget.cpp | 4 +- .../storage/storage_shared_media.cpp | 3 +- .../storage/storage_user_photos.cpp | 3 +- Telegram/SourceFiles/ui/rp_widget.h | 2 +- Telegram/SourceFiles/ui/widgets/labels.cpp | 4 +- Telegram/SourceFiles/ui/wrap/slide_wrap.cpp | 2 +- .../SourceFiles/ui/wrap/vertical_layout.cpp | 2 +- Telegram/SourceFiles/ui/wrap/wrap.h | 7 +- .../SourceFiles/window/player_wrap_widget.cpp | 2 +- .../SourceFiles/window/top_bar_widget.cpp | 4 +- 41 files changed, 384 insertions(+), 1113 deletions(-) diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp index 6cb2bf5fa..c3bca0bcd 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp @@ -288,7 +288,7 @@ void EditPrivacyBox::createWidgets() { auto createExceptionLink = [this](Exception exception) { exceptionLink(exception).create(this, object_ptr(this, exceptionLinkText(exception)), exceptionLinkMargins()); exceptionLink(exception)->heightValue() - | rpl::start([this](int) { + | rpl::start_with_next([this](int) { resizeToWidth(width()); }, lifetime()); exceptionLink(exception)->entity()->setClickedCallback([this, exception] { editExceptionUsers(exception); }); diff --git a/Telegram/SourceFiles/boxes/notifications_box.cpp b/Telegram/SourceFiles/boxes/notifications_box.cpp index b61cc10d4..6457a8531 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.cpp +++ b/Telegram/SourceFiles/boxes/notifications_box.cpp @@ -128,7 +128,9 @@ void NotificationsBox::prepare() { } _countSlider->setActiveSectionFast(_oldCount - 1); _countSlider->sectionActivated() - | rpl::start([this](int) { countChanged(); }, lifetime()); + | rpl::start_with_next( + [this](int) { countChanged(); }, + lifetime()); setMouseTracking(true); diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index da03a385e..027711b12 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -51,7 +51,7 @@ void PeerListBox::createMultiSelect() { auto entity = object_ptr(this, st::contactsMultiSelect, langFactory(lng_participant_filter)); _select.create(this, std::move(entity)); _select->heightValue() - | rpl::start( + | rpl::start_with_next( [this](int) { updateScrollSkips(); }, lifetime()); _select->entity()->setSubmittedCallback([this](bool chtrlShiftEnter) { content()->submitted(); }); @@ -105,7 +105,7 @@ void PeerListBox::prepare() { } content()->scrollToRequests() - | rpl::start([this](Ui::ScrollToRequest request) { + | rpl::start_with_next([this](Ui::ScrollToRequest request) { onScrollToY(request.ymin, request.ymax); }, lifetime()); diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 6240d8752..722ac7b40 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -58,7 +58,7 @@ void StickerSetBox::prepare() { connect(_inner, SIGNAL(updateButtons()), this, SLOT(onUpdateButtons())); _inner->setInstalled() - | rpl::start([this](auto &&setId) { + | rpl::start_with_next([this](auto &&setId) { Auth().api().stickerSetInstalled(setId); this->closeBox(); }, lifetime()); diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index 61d076d57..f6354ec4e 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -245,7 +245,9 @@ void StickersBox::prepare() { } setNoContentMargin(true); _tabs->sectionActivated() - | rpl::start([this](int) { switchTab(); }, lifetime()); + | rpl::start_with_next( + [this](int) { switchTab(); }, + lifetime()); refreshTabs(); } if (_installed.widget() && _section != Section::Installed) _installed.widget()->hide(); diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp index 0b99be478..1a173d6e7 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp @@ -63,7 +63,7 @@ TabbedPanel::TabbedPanel( } }); _selector->showRequests() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->showFromSelector(); }, lifetime()); diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index 36a35ee72..710b0cc7d 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -347,8 +347,9 @@ TabbedSelector::TabbedSelector(QWidget *parent, not_null co })); Auth().api().stickerSetInstalled() - | rpl::start([this](uint64 setId) { - _tabsSlider->setActiveSection(static_cast(SelectorTab::Stickers)); + | rpl::start_with_next([this](uint64 setId) { + _tabsSlider->setActiveSection( + static_cast(SelectorTab::Stickers)); stickers()->showStickerSet(setId); _showRequests.fire({}); }, lifetime()); @@ -607,7 +608,9 @@ void TabbedSelector::createTabsSlider() { _tabsSlider->setActiveSectionFast(static_cast(_currentTabType)); _tabsSlider->sectionActivated() - | rpl::start([this](int) { switchTab(); }, lifetime()); + | rpl::start_with_next( + [this](int) { switchTab(); }, + lifetime()); _tabsSlider->resizeToWidth(width()); _tabsSlider->moveToLeft(0, 0); diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp index 7d8f555b6..46952be7c 100644 --- a/Telegram/SourceFiles/data/data_peer.cpp +++ b/Telegram/SourceFiles/data/data_peer.cpp @@ -692,7 +692,7 @@ ChannelData::ChannelData(const PeerId &id) : PeerData(id) , inputChannel(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))) { Data::PeerFlagValue(this, MTPDchannel::Flag::f_megagroup) - | rpl::start([this](bool megagroup) { + | rpl::start_with_next([this](bool megagroup) { if (megagroup) { if (!mgInfo) { mgInfo = std::make_unique(); diff --git a/Telegram/SourceFiles/history/history_shared_media.cpp b/Telegram/SourceFiles/history/history_shared_media.cpp index ad10ec73d..c5de5c303 100644 --- a/Telegram/SourceFiles/history/history_shared_media.cpp +++ b/Telegram/SourceFiles/history/history_shared_media.cpp @@ -478,20 +478,20 @@ rpl::producer SharedMediaViewer( data.second); }; builder->insufficientMediaAround() - | rpl::start(requestMediaAround, lifetime); + | rpl::start_with_next(requestMediaAround, lifetime); Auth().storage().sharedMediaSliceUpdated() - | rpl::start(applyUpdate, lifetime); + | rpl::start_with_next(applyUpdate, lifetime); Auth().storage().sharedMediaOneRemoved() - | rpl::start(applyUpdate, lifetime); + | rpl::start_with_next(applyUpdate, lifetime); Auth().storage().sharedMediaAllRemoved() - | rpl::start(applyUpdate, lifetime); + | rpl::start_with_next(applyUpdate, lifetime); Auth().storage().query(Storage::SharedMediaQuery( key, limitBefore, limitAfter)) - | rpl::start( + | rpl::start_with_next_done( applyUpdate, [=] { builder->checkInsufficientMedia(); }, lifetime); @@ -626,7 +626,7 @@ rpl::producer SharedMediaMergedViewer( SharedMediaMergedSlice::PartKey(key), limitBefore, limitAfter - ) | rpl::start([=](SharedMediaSlice &&update) { + ) | rpl::start_with_next([=](SharedMediaSlice &&update) { builder->applyPartUpdate(std::move(update)); consumer.put_next(builder->snapshot()); }, lifetime); @@ -636,7 +636,7 @@ rpl::producer SharedMediaMergedViewer( SharedMediaMergedSlice::MigratedKey(key), limitBefore, limitAfter - ) | rpl::start([=](SharedMediaSlice &&update) { + ) | rpl::start_with_next([=](SharedMediaSlice &&update) { builder->applyMigratedUpdate(std::move(update)); consumer.put_next(builder->snapshot()); }, lifetime); @@ -778,7 +778,7 @@ rpl::producer SharedMediaWithLastViewer( SharedMediaWithLastSlice::ViewerKey(key), limitBefore, limitAfter - ) | rpl::start([=](SharedMediaMergedSlice &&update) { + ) | rpl::start_with_next([=](SharedMediaMergedSlice &&update) { builder->applyViewerUpdate(std::move(update)); consumer.put_next(builder->snapshot()); }, lifetime); @@ -788,7 +788,7 @@ rpl::producer SharedMediaWithLastViewer( SharedMediaWithLastSlice::EndingKey(key), 1, 1 - ) | rpl::start([=](SharedMediaMergedSlice &&update) { + ) | rpl::start_with_next([=](SharedMediaMergedSlice &&update) { builder->applyEndingUpdate(std::move(update)); consumer.put_next(builder->snapshot()); }, lifetime); diff --git a/Telegram/SourceFiles/history/history_user_photos.cpp b/Telegram/SourceFiles/history/history_user_photos.cpp index 59990db2d..b7cab88a8 100644 --- a/Telegram/SourceFiles/history/history_user_photos.cpp +++ b/Telegram/SourceFiles/history/history_user_photos.cpp @@ -231,16 +231,16 @@ rpl::producer UserPhotosViewer( Auth().api().requestUserPhotos(user, photoId); }; builder->insufficientPhotosAround() - | rpl::start(requestPhotosAround, lifetime); + | rpl::start_with_next(requestPhotosAround, lifetime); Auth().storage().userPhotosSliceUpdated() - | rpl::start(applyUpdate, lifetime); + | rpl::start_with_next(applyUpdate, lifetime); Auth().storage().query(Storage::UserPhotosQuery( key, limitBefore, limitAfter)) - | rpl::start( + | rpl::start_with_next_done( applyUpdate, [=] { builder->checkInsufficientPhotos(); }, lifetime); diff --git a/Telegram/SourceFiles/info/info_layer_wrap.cpp b/Telegram/SourceFiles/info/info_layer_wrap.cpp index 1be85188d..52f8035dc 100644 --- a/Telegram/SourceFiles/info/info_layer_wrap.cpp +++ b/Telegram/SourceFiles/info/info_layer_wrap.cpp @@ -61,12 +61,12 @@ LayerWrap::LayerWrap( void LayerWrap::setupHeightConsumers() { _content->desiredHeightValue() - | rpl::start([this](int height) { + | rpl::start_with_next([this](int height) { _desiredHeight = height; resizeToWidth(width()); }, lifetime()); heightValue() - | rpl::start([this](int height) { + | rpl::start_with_next([this](int height) { _content->resize( width(), height - _topBar->bottomNoMargins() - st::boxRadius); @@ -81,7 +81,7 @@ object_ptr LayerWrap::createTopBar() { result.data(), st::infoLayerTopBarClose)); close->clicks() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { _controller->hideSpecialLayer(); }, close->lifetime()); result->setTitle(TitleValue( diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp index fc27318c2..aad45f61f 100644 --- a/Telegram/SourceFiles/info/info_memento.cpp +++ b/Telegram/SourceFiles/info/info_memento.cpp @@ -110,7 +110,10 @@ Ui::RpWidget *ContentWidget::doSetInnerWidget( _scroll->heightValue(), _inner->desiredHeightValue(), tuple($1, $1 + $2, $3)) - | rpl::start([inner = _inner](int top, int bottom, int desired) { + | rpl::start_with_next([inner = _inner]( + int top, + int bottom, + int desired) { inner->setVisibleTopBottom(top, bottom); }, _inner->lifetime()); return _inner; diff --git a/Telegram/SourceFiles/info/info_narrow_wrap.cpp b/Telegram/SourceFiles/info/info_narrow_wrap.cpp index a11214240..fe1c8967b 100644 --- a/Telegram/SourceFiles/info/info_narrow_wrap.cpp +++ b/Telegram/SourceFiles/info/info_narrow_wrap.cpp @@ -94,7 +94,7 @@ object_ptr NarrowWrap::createTopBar() { st::infoLayerTopBar); result->enableBackButton(true); result->backRequest() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->controller()->showBackFromStack(); }, result->lifetime()); result->setTitle(TitleValue( diff --git a/Telegram/SourceFiles/info/info_side_wrap.cpp b/Telegram/SourceFiles/info/info_side_wrap.cpp index 47cbb7ae9..c89382a1b 100644 --- a/Telegram/SourceFiles/info/info_side_wrap.cpp +++ b/Telegram/SourceFiles/info/info_side_wrap.cpp @@ -62,7 +62,9 @@ void SideWrap::setupTabs() { _tabs->setSections(sections); _tabs->sectionActivated() | rpl::map([](int index) { return static_cast(index); }) - | rpl::start([this](Tab tab) { showTab(tab); }, _lifetime); + | rpl::start_with_next( + [this](Tab tab) { showTab(tab); }, + _lifetime); _tabs->move(0, 0); _tabs->resizeToWidth(width()); diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp index b1de47978..d5bdc9bb0 100644 --- a/Telegram/SourceFiles/info/info_top_bar.cpp +++ b/Telegram/SourceFiles/info/info_top_bar.cpp @@ -58,7 +58,7 @@ void TopBar::pushButton(object_ptr button) { auto weak = Ui::AttachParentChild(this, button); _buttons.push_back(std::move(button)); weak->widthValue() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->updateControlsGeometry(this->width()); }, _lifetime); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_button.cpp b/Telegram/SourceFiles/info/profile/info_profile_button.cpp index 767159aa2..6e70c0d4f 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_button.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_button.cpp @@ -40,7 +40,7 @@ Button::Button( : RippleButton(parent, st.ripple) , _st(st) { std::move(text) - | rpl::start([this](QString &&value) { + | rpl::start_with_next([this](QString &&value) { setText(std::move(value)); }, lifetime()); } @@ -52,11 +52,11 @@ Button *Button::toggleOn(rpl::producer &&toggled) { false, [this] { rtlupdate(toggleRect()); }); clicks() - | rpl::start([this](auto) { + | rpl::start_with_next([this](auto) { _toggle->setCheckedAnimated(!_toggle->checked()); }, lifetime()); std::move(toggled) - | rpl::start([this](bool toggled) { + | rpl::start_with_next([this](bool toggled) { _toggle->setCheckedAnimated(toggled); }, lifetime()); _toggle->finishAnimation(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp index a8674833d..bb79ec3b2 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp @@ -171,11 +171,11 @@ SectionWithToggle *SectionWithToggle::setToggleShown( _toggle->lower(); _toggle->setCheckAlignment(style::al_right); widthValue() - | rpl::start([this](int newValue) { + | rpl::start_with_next([this](int newValue) { _toggle->setGeometry(0, 0, newValue, height()); }, _toggle->lifetime()); std::move(shown) - | rpl::start([this](bool shown) { + | rpl::start_with_next([this](bool shown) { if (_toggle->isHidden() == shown) { _toggle->setVisible(shown); _toggleShown.fire_copy(shown); @@ -230,7 +230,7 @@ void Cover::setupChildGeometry() { toggleShownValue(), widthValue(), $2) - | rpl::start([this](int newWidth) { + | rpl::start_with_next([this](int newWidth) { _userpic->moveToLeft( st::infoProfilePhotoLeft, st::infoProfilePhotoTop, @@ -242,7 +242,7 @@ void Cover::setupChildGeometry() { Cover *Cover::setOnlineCount(rpl::producer &&count) { std::move(count) - | rpl::start([this](int count) { + | rpl::start_with_next([this](int count) { _onlineCount = count; refreshStatusText(); }, lifetime()); @@ -252,16 +252,16 @@ Cover *Cover::setOnlineCount(rpl::producer &&count) { void Cover::initViewers() { using Flag = Notify::PeerUpdate::Flag; PeerUpdateValue(_peer, Flag::PhotoChanged) - | rpl::start( + | rpl::start_with_next( [this](auto&&) { this->refreshUserpicLink(); }, lifetime()); PeerUpdateValue(_peer, Flag::NameChanged) - | rpl::start( + | rpl::start_with_next( [this](auto&&) { this->refreshNameText(); }, lifetime()); PeerUpdateValue(_peer, Flag::UserOnlineChanged | Flag::MembersChanged) - | rpl::start( + | rpl::start_with_next( [this](auto&&) { this->refreshStatusText(); }, lifetime()); } @@ -367,7 +367,7 @@ void SharedMediaCover::createLabel() { toggleShownValue(), widthValue(), $2) - | rpl::start([this, weak = label.data()](int newWidth) { + | rpl::start_with_next([this, weak = label.data()](int newWidth) { auto availableWidth = newWidth - st::infoBlockHeaderPosition.x() - st::infoSharedMediaButton.padding.right() diff --git a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp index 938ebe8a3..27571d102 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp @@ -43,7 +43,7 @@ FloatingIcon::FloatingIcon( _point.y() + _icon->height()); setAttribute(Qt::WA_TransparentForMouseEvents); parent->widthValue() - | rpl::start( + | rpl::start_with_next( [this](auto&&) { moveToLeft(0, 0); }, lifetime()); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index f02749dcc..39d44ca7f 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -61,7 +61,7 @@ InnerWidget::InnerWidget( , _peer(peer) , _content(setupContent(this, std::move(wrapValue))) { _content->heightValue() - | rpl::start([this](int height) { + | rpl::start_with_next([this](int height) { TWidget::resizeToWidth(width()); _desiredHeight.fire(countDesiredHeight()); }, lifetime()); @@ -113,7 +113,7 @@ object_ptr InnerWidget::setupContent( _peer) ); _members->scrollToRequests() - | rpl::start([this](Ui::ScrollToRequest request) { + | rpl::start_with_next([this](Ui::ScrollToRequest request) { auto min = (request.ymin < 0) ? request.ymin : mapFromGlobal(_members->mapToGlobal({ 0, request.ymin })).y(); @@ -203,7 +203,7 @@ object_ptr InnerWidget::setupMuteToggle( result->toggleOn( NotificationsEnabledValue(_peer) )->clicks() - | rpl::start([this](auto) { + | rpl::start_with_next([this](auto) { App::main()->updateNotifySetting( _peer, _peer->isMuted() @@ -239,7 +239,7 @@ void InnerWidget::setupUserButtons( _controller->historyPeer.value() | rpl::map($1 != user) )->entity()->clicks() - | rpl::start([this, user](auto&&) { + | rpl::start_with_next([this, user](auto&&) { _controller->showPeerHistory( user, Ui::ShowWay::Forward); @@ -250,7 +250,7 @@ void InnerWidget::setupUserButtons( )->toggleOn( CanAddContactValue(user) )->entity()->clicks() - | rpl::start([user](auto&&) { + | rpl::start_with_next([user](auto&&) { auto firstName = user->firstName; auto lastName = user->lastName; auto phone = user->phone().isEmpty() @@ -310,7 +310,7 @@ object_ptr InnerWidget::setupSharedMedia( return phrase(lt_count, count); } )->entity()->clicks() - | rpl::start([peer = _peer, type](auto&&) { + | rpl::start_with_next([peer = _peer, type](auto&&) { SharedMediaShowOverview(type, App::history(peer)); }, content->lifetime()); }; @@ -321,7 +321,7 @@ object_ptr InnerWidget::setupSharedMedia( return lng_profile_common_groups(lt_count, count); } )->entity()->clicks() - | rpl::start([peer = _peer](auto&&) { + | rpl::start_with_next([peer = _peer](auto&&) { App::main()->showSection( ::Profile::CommonGroups::SectionMemento( peer->asUser()), @@ -389,7 +389,7 @@ object_ptr InnerWidget::setupUserActions( )->toggleOn( std::move(toggleOn) )->entity()->clicks() - | rpl::start([callback = std::move(callback)](auto&&) { + | rpl::start_with_next([callback = std::move(callback)](auto&&) { callback(); }, result->lifetime()); }; diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp index 2b5bee8ed..6a9d28309 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp @@ -65,7 +65,7 @@ Members::Members( , _list(setupList(this, _controller.get())) { setupButtons(); std::move(wrapValue) - | rpl::start([this](Wrap wrap) { + | rpl::start_with_next([this](Wrap wrap) { _wrap = wrap; updateSearchOverrides(); }, lifetime()); @@ -110,7 +110,7 @@ void Members::setupButtons() { auto addMemberShown = CanAddMemberValue(_peer) | rpl::start_spawning(lifetime()); widthValue() - | rpl::start([button = _addMember.data()](int newWidth) { + | rpl::start_with_next([button = _addMember.data()](int newWidth) { button->moveToRight( st::infoMembersButtonPosition.x(), st::infoMembersButtonPosition.y(), @@ -118,7 +118,7 @@ void Members::setupButtons() { }, _addMember->lifetime()); _addMember->showOn(rpl::duplicate(addMemberShown)); _addMember->clicks() // TODO throttle(ripple duration) - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->addMember(); }, _addMember->lifetime()); @@ -128,18 +128,18 @@ void Members::setupButtons() { | rpl::start_spawning(lifetime()); _search->showOn(rpl::duplicate(searchShown)); _search->clicks() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->showSearch(); }, _search->lifetime()); _cancelSearch->clicks() - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->cancelSearch(); }, _cancelSearch->lifetime()); rpl::combine( std::move(addMemberShown), std::move(searchShown)) - | rpl::start([this](auto&&) { + | rpl::start_with_next([this](auto&&) { this->resizeToWidth(width()); }, lifetime()); @@ -157,7 +157,7 @@ object_ptr Members::setupList( controller, st::infoMembersList); result->scrollToRequests() - | rpl::start([this](Ui::ScrollToRequest request) { + | rpl::start_with_next([this](Ui::ScrollToRequest request) { auto addmin = (request.ymin < 0) ? 0 : st::infoMembersHeader; @@ -170,11 +170,11 @@ object_ptr Members::setupList( }, result->lifetime()); result->moveToLeft(0, st::infoMembersHeader); parent->widthValue() - | rpl::start([list = result.data()](int newWidth) { + | rpl::start_with_next([list = result.data()](int newWidth) { list->resizeToWidth(newWidth); }, result->lifetime()); result->heightValue() - | rpl::start([parent](int listHeight) { + | rpl::start_with_next([parent](int listHeight) { auto newHeight = (listHeight > st::membersMarginBottom) ? (st::infoMembersHeader + listHeight) : 0; diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp index fd48fd932..7ede00627 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp @@ -53,7 +53,7 @@ Widget::Widget( peer)); _inner->move(0, 0); _inner->scrollToRequests() - | rpl::start([this](Ui::ScrollToRequest request) { + | rpl::start_with_next([this](Ui::ScrollToRequest request) { if (request.ymin < 0) { scrollTopRestore( qMin(scrollTopSave(), request.ymax)); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 8ce1fd36b..48409cfab 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -187,7 +187,7 @@ MainWidget::MainWidget( | rpl::map(tuple(peer, $1)); }) | rpl::flatten_latest() - | rpl::start([this](PeerData *peer, bool canWrite) { + | rpl::start_with_next([this](PeerData *peer, bool canWrite) { updateThirdColumnToCurrentPeer(peer, canWrite); }, lifetime()); @@ -1846,7 +1846,7 @@ void MainWidget::createPlayer() { if (!_player) { _player.create(this); _player->heightValue() - | rpl::start( + | rpl::start_with_next( [this](int) { playerHeightUpdated(); }, lifetime()); _player->entity()->setCloseCallback([this] { closeBothPlayers(); }); @@ -1907,7 +1907,7 @@ void MainWidget::createCallTopBar() { Expects(_currentCall != nullptr); _callTopBar.create(this, object_ptr(this, _currentCall)); _callTopBar->heightValue() - | rpl::start([this](int value) { + | rpl::start_with_next([this](int value) { callTopBarHeightUpdated(value); }, lifetime()); orderWidgets(); diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index ad87b3d61..40f58e2c7 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1059,7 +1059,8 @@ void MediaView::validateSharedMedia() { *key, kIdsLimit, kIdsLimit - ) | rpl::start([this](SharedMediaWithLastSlice &&update) { + ) | rpl::start_with_next([this]( + SharedMediaWithLastSlice &&update) { handleSharedMediaUpdate(std::move(update)); }, _sharedMedia->lifetime); } else { @@ -1118,7 +1119,8 @@ void MediaView::validateUserPhotos() { *key, kIdsLimit, kIdsLimit - ) | rpl::start([this](UserPhotosSlice &&update) { + ) | rpl::start_with_next([this]( + UserPhotosSlice &&update) { handleUserPhotosUpdate(std::move(update)); }, _userPhotos->lifetime); } else { diff --git a/Telegram/SourceFiles/rpl/event_stream.h b/Telegram/SourceFiles/rpl/event_stream.h index 17b1a2fc6..61a15407e 100644 --- a/Telegram/SourceFiles/rpl/event_stream.h +++ b/Telegram/SourceFiles/rpl/event_stream.h @@ -159,7 +159,7 @@ template inline auto start_to_stream( event_stream &stream, lifetime &alive_while) { - return start([&stream](auto &&value) { + return start_with_next([&stream](auto &&value) { stream.fire_forward(std::forward(value)); }, alive_while); } diff --git a/Telegram/SourceFiles/rpl/operators_tests.cpp b/Telegram/SourceFiles/rpl/operators_tests.cpp index 5ab4ad3cc..163b2a3cd 100644 --- a/Telegram/SourceFiles/rpl/operators_tests.cpp +++ b/Telegram/SourceFiles/rpl/operators_tests.cpp @@ -100,15 +100,15 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { }); rpl::lifetime lifetime; single(std::move(counter)) - | on_next([=](InvokeCounter&&) { + | start_with_next_error_done([=](InvokeCounter&&) { (void)destroyCalled; ++*sum; - }) | on_error([=](no_error) { + }, [=](no_error) { (void)destroyCalled; - }) | on_done([=] { + }, [=] { (void)destroyCalled; *doneGenerated = true; - }) | start(lifetime); + }, lifetime); } REQUIRE(*sum == 1); REQUIRE(*doneGenerated); @@ -136,18 +136,15 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { rpl::lifetime lifetime; std::move(testing) | then(complete()) - | on_next([=](InvokeCounter&&) { + | start_with_next_error_done([=](InvokeCounter&&) { (void)destroyCalled; ++*sum; - }) - | on_error([=](no_error) { + }, [=](no_error) { (void)destroyCalled; - }) - | on_done([=] { + }, [=] { (void)destroyCalled; *doneGenerated = true; - }) - | start(lifetime); + }, lifetime); } REQUIRE(*sum == 5); REQUIRE(*doneGenerated); @@ -167,10 +164,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { | map([](int value) { return std::to_string(value); }) - | on_next([=](std::string &&value) { + | start_with_next([=](std::string &&value) { *sum += std::move(value) + ' '; - }) - | start(lifetime); + }, lifetime); } REQUIRE(*sum == "1 2 3 4 5 "); } @@ -190,11 +186,10 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { | then(make_next()) | then(make_next()) | then(make_next()) - | on_next([=](int value) { + | start_with_next([=](int value) { REQUIRE(++*checked == *launched); REQUIRE(*checked == value); - }) - | start(lifetime); + }, lifetime); REQUIRE(*launched == 5); } } @@ -212,10 +207,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { | map([](int value) { return std::to_string(value); }) - | on_next([=](std::string &&value) { + | start_with_next([=](std::string &&value) { *sum += std::move(value) + ' '; - }) - | start(lifetime); + }, lifetime); } REQUIRE(*sum == "1 1 3 "); } @@ -233,10 +227,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { | map([](int value) { return std::to_string(value); }) - | on_next([=](std::string &&value) { + | start_with_next([=](std::string &&value) { *sum += std::move(value) + ' '; - }) - | start(lifetime); + }, lifetime); } REQUIRE(*sum == "1 2 3 "); } @@ -252,10 +245,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { | map([](int value) { return std::to_string(value); }) - | on_next([=](std::string &&value) { + | start_with_next([=](std::string &&value) { *sum += std::move(value) + ' '; - }) - | start(lifetime); + }, lifetime); } REQUIRE(*sum == "1 2 3 4 5 6 "); } @@ -276,10 +268,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { combine(std::move(v), [](const auto &values) { return values[0] && values[1] && !values[2]; }) - | on_next([=](bool value) { + | start_with_next([=](bool value) { *sum += std::to_string(value ? 1 : 0); - }) - | start(lifetime); + }, lifetime); a.fire(true); b.fire(true); @@ -307,10 +298,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { [](long a, long b, long c) { return a; }) - | on_next([=](int value) { + | start_with_next([=](int value) { *sum += std::to_string(value); - }) - | start(lifetime); + }, lifetime); combine( a.events(), @@ -319,10 +309,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { [](auto &&value) { return std::get<1>(value); }) - | on_next([=](int value) { + | start_with_next([=](int value) { *sum += std::to_string(value); - }) - | start(lifetime); + }, lifetime); combine(a.events(), b.events(), c.events()) | map([](auto &&value) { @@ -331,12 +320,11 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { std::to_string(std::get<1>(value)), std::to_string(std::get<2>(value))); }) - | on_next([=](auto &&value) { + | start_with_next([=](auto &&value) { *sum += std::get<0>(value) + ' ' + std::get<1>(value) + ' ' + std::get<2>(value) + ' '; - }) - | start(lifetime); + }, lifetime); a.fire(1); b.fire(2); c.fire(3); @@ -362,10 +350,9 @@ TEST_CASE("basic operators tests", "[rpl::operators]") { b.events(), c.events(), $1 + $2 + $3 + 10) - | on_next([=](int value) { + | start_with_next([=](int value) { *sum += std::to_string(value); - }) - | start(lifetime); + }, lifetime); a.fire(1); b.fire(2); diff --git a/Telegram/SourceFiles/rpl/producer.h b/Telegram/SourceFiles/rpl/producer.h index c3a12f1d6..d59184548 100644 --- a/Telegram/SourceFiles/rpl/producer.h +++ b/Telegram/SourceFiles/rpl/producer.h @@ -190,967 +190,280 @@ inline auto operator|(producer &&value, Method &&method) { return std::forward(method)(std::move(value)); } -template -inline auto bind_on_next(OnNext &&handler) { - return [handler = std::forward(handler)]( - auto &&existing) mutable { - using error_type = typename std::decay_t::error_type; - return producer([ - existing = std::move(existing), - handler = std::move(handler) - ](const consumer &consumer) mutable { - return std::move(existing).start( - std::move(handler), - [consumer](error_type &&error) { - consumer.put_error(std::move(error)); - }, [consumer] { - consumer.put_done(); - }); - }); - }; -} - -template -inline auto bind_on_error(OnError &&handler) { - return [handler = std::forward(handler)](auto &&existing) mutable { - using value_type = typename std::decay_t::value_type; - return producer([ - existing = std::move(existing), - handler = std::move(handler) - ](const consumer &consumer) mutable { - return std::move(existing).start( - [consumer](value_type &&value) { - consumer.put_next(std::move(value)); - }, - std::move(handler), - [consumer] { - consumer.put_done(); - }); - }); - }; -} - -template -inline auto bind_on_done(OnDone &&handler) { - return [handler = std::forward(handler)](auto &&existing) mutable { - using value_type = typename std::decay_t::value_type; - using error_type = typename std::decay_t::error_type; - return producer([ - existing = std::move(existing), - handler = std::move(handler) - ](const consumer &consumer) mutable { - return std::move(existing).start( - [consumer](value_type &&value) { - consumer.put_next(std::move(value)); - }, - [consumer](error_type &&value) { - consumer.put_error(std::move(value)); - }, - std::move(handler)); - }); - }; -} - namespace details { +struct lifetime_with_none { + lifetime &alive_while; +}; + template -struct next_holder { +struct lifetime_with_next { + lifetime &alive_while; OnNext next; }; template -struct error_holder { +struct lifetime_with_error { + lifetime &alive_while; OnError error; }; template -struct done_holder { +struct lifetime_with_done { + lifetime &alive_while; OnDone done; }; -template < - typename Value, - typename Error, - typename OnNext> -struct producer_with_next { - producer bound; - OnNext next; -}; - -template < - typename Value, - typename Error, - typename OnError> -struct producer_with_error { - producer bound; - OnError error; -}; - -template < - typename Value, - typename Error, - typename OnDone> -struct producer_with_done { - producer bound; - OnDone done; -}; - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError> -struct producer_with_next_error { - producer bound; +template +struct lifetime_with_next_error { + lifetime &alive_while; OnNext next; OnError error; }; -template < - typename Value, - typename Error, - typename OnNext, - typename OnDone> -struct producer_with_next_done { - producer bound; - OnNext next; - OnDone done; -}; - -template < - typename Value, - typename Error, - typename OnError, - typename OnDone> -struct producer_with_error_done { - producer bound; +template +struct lifetime_with_error_done { + lifetime &alive_while; OnError error; OnDone done; }; -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename OnDone> -struct producer_with_next_error_done { - producer bound; +template +struct lifetime_with_next_done { + lifetime &alive_while; + OnNext next; + OnDone done; +}; + +template +struct lifetime_with_next_error_done { + lifetime &alive_while; OnNext next; OnError error; OnDone done; }; -struct lifetime_holder { - lifetime &alive_while; -}; - -template -struct lifetime_holder_1 { - Callback1 callback1; - lifetime &alive_while; -}; - -template -struct lifetime_holder_2 { - Callback1 callback1; - Callback2 callback2; - lifetime &alive_while; -}; - -template -struct lifetime_holder_3 { - Callback1 callback1; - Callback2 callback2; - Callback3 callback3; - lifetime &alive_while; -}; - -enum class CallbackType { - Next, - Error, - Done, - Invalid, -}; - -template -inline auto on_next_dispatch( - Callback &&callback, - std::integral_constant) { - return [](const auto&) {}; -} - -template -inline decltype(auto) on_next_dispatch( - Callback &&callback, - std::integral_constant) { - return std::forward(callback); -} - -template -inline auto on_error_dispatch( - Callback &&callback, - std::integral_constant) { - return [](const auto&) {}; -} - -template -inline decltype(auto) on_error_dispatch( - Callback &&callback, - std::integral_constant) { - return std::forward(callback); -} - -template -inline auto on_done_dispatch( - Callback &&callback, - std::integral_constant) { - return [] {}; -} - -template -inline decltype(auto) on_done_dispatch( - Callback &&callback, - std::integral_constant) { - return std::forward(callback); -} - -enum class CallbacksType { - NextError, - NextDone, - ErrorDone, - Invalid, -}; - -template -inline auto on_next_dispatch( - Callback1 &&callback1, - std::integral_constant) { - return [](const auto&) {}; -} - -template -inline decltype(auto) on_next_dispatch( - Callback1 &&callback1, - std::integral_constant) { - return std::forward(callback1); -} - -template -inline decltype(auto) on_next_dispatch( - Callback1 &&callback1, - std::integral_constant) { - return std::forward(callback1); -} - -template -inline auto on_error_dispatch( - Callback1 &&callback1, - Callback2 &&callback2, - std::integral_constant) { - return [](const auto&) {}; -} - -template -inline decltype(auto) on_error_dispatch( - Callback1 &&callback1, - Callback2 &&callback2, - std::integral_constant) { - return std::forward(callback2); -} - -template -inline decltype(auto) on_error_dispatch( - Callback1 &&callback1, - Callback2 &&callback2, - std::integral_constant) { - return std::forward(callback1); -} - -template -inline auto on_done_dispatch( - Callback2 &&callback2, - std::integral_constant) { - return [] {}; -} - -template -inline decltype(auto) on_done_dispatch( - Callback2 &&callback2, - std::integral_constant) { - return std::forward(callback2); -} - -template -inline decltype(auto) on_done_dispatch( - Callback2 &&callback2, - std::integral_constant) { - return std::forward(callback2); -} - } // namespace details -template -inline details::next_holder> on_next(OnNext &&handler) { - return { std::forward(handler) }; -} - -template -inline details::error_holder> on_error(OnError &&handler) { - return { std::forward(handler) }; -} - -template -inline details::done_holder> on_done(OnDone &&handler) { - return { std::forward(handler) }; -} - -inline details::lifetime_holder start(lifetime &alive_while) { +inline auto start(lifetime &alive_while) +-> details::lifetime_with_none { return { alive_while }; } -template -inline details::lifetime_holder_1< - std::decay_t> start( - Callback1 &&callback1, - lifetime &alive_while) { - return { - std::forward(callback1), - alive_while }; +template +inline auto start_with_next(OnNext &&next, lifetime &alive_while) +-> details::lifetime_with_next> { + return { alive_while, std::forward(next) }; } -template -inline details::lifetime_holder_2< - std::decay_t, - std::decay_t> start( - Callback1 &&callback1, - Callback2 &&callback2, - lifetime &alive_while) { - return { - std::forward(callback1), - std::forward(callback2), - alive_while }; +template +inline auto start_with_error(OnError &&error, lifetime &alive_while) +-> details::lifetime_with_error> { + return { alive_while, std::forward(error) }; } -template -inline details::lifetime_holder_3< - std::decay_t, - std::decay_t, - std::decay_t> start( - Callback1 &&callback1, - Callback2 &&callback2, - Callback3 &&callback3, - lifetime &alive_while) { +template +inline auto start_with_done(OnDone &&done, lifetime &alive_while) +-> details::lifetime_with_done> { + return { alive_while, std::forward(done) }; +} + +template +inline auto start_with_next_error( + OnNext &&next, + OnError &&error, + lifetime &alive_while) +-> details::lifetime_with_next_error< + std::decay_t, + std::decay_t> { return { - std::forward(callback1), - std::forward(callback2), - std::forward(callback3), - alive_while }; + alive_while, + std::forward(next), + std::forward(error) + }; +} + +template +inline auto start_with_error_done( + OnError &&error, + OnDone &&done, + lifetime &alive_while) +-> details::lifetime_with_error_done< + std::decay_t, + std::decay_t> { + return { + alive_while, + std::forward(error), + std::forward(done) + }; +} + +template +inline auto start_with_next_done( + OnNext &&next, + OnDone &&done, + lifetime &alive_while) +-> details::lifetime_with_next_done< + std::decay_t, + std::decay_t> { + return { + alive_while, + std::forward(next), + std::forward(done) + }; +} + +template +inline auto start_with_next_error_done( + OnNext &&next, + OnError &&error, + OnDone &&done, + lifetime &alive_while) +-> details::lifetime_with_next_error_done< + std::decay_t, + std::decay_t, + std::decay_t> { + return { + alive_while, + std::forward(next), + std::forward(error), + std::forward(done) + }; } namespace details { -template < - typename Value, - typename Error, - typename OnNext, - typename = std::enable_if_t< - is_callable_v>> -inline producer_with_next operator|( - producer &&value, - next_holder &&handler) { - return { std::move(value), std::move(handler.next) }; -} - -template < - typename Value, - typename Error, - typename OnError, - typename = std::enable_if_t< - is_callable_v>> -inline producer_with_error operator|( - producer &&value, - error_holder &&handler) { - return { std::move(value), std::move(handler.error) }; -} - -template < - typename Value, - typename Error, - typename OnDone, - typename = std::enable_if_t< - is_callable_v>> -inline producer_with_done operator|( - producer &&value, - done_holder &&handler) { - return { std::move(value), std::move(handler.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline producer_with_next_error operator|( - producer_with_next &&producer_with_next, - error_holder &&handler) { - return { - std::move(producer_with_next.bound), - std::move(producer_with_next.next), - std::move(handler.error) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline producer_with_next_error operator|( - producer_with_error &&producer_with_error, - next_holder &&handler) { - return { - std::move(producer_with_error.bound), - std::move(handler.next), - std::move(producer_with_error.error) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v>> -inline producer_with_next_done operator|( - producer_with_next &&producer_with_next, - done_holder &&handler) { - return { - std::move(producer_with_next.bound), - std::move(producer_with_next.next), - std::move(handler.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v>> -inline producer_with_next_done operator|( - producer_with_done &&producer_with_done, - next_holder &&handler) { - return { - std::move(producer_with_done.bound), - std::move(handler.next), - std::move(producer_with_done.done) }; -} - -template < - typename Value, - typename Error, - typename OnError, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v>> -inline producer_with_error_done operator|( - producer_with_error &&producer_with_error, - done_holder &&handler) { - return { - std::move(producer_with_error.bound), - std::move(producer_with_error.error), - std::move(handler.done) }; -} - -template < - typename Value, - typename Error, - typename OnError, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v>> -inline producer_with_error_done operator|( - producer_with_done &&producer_with_done, - error_holder &&handler) { - return { - std::move(producer_with_done.bound), - std::move(handler.error), - std::move(producer_with_done.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v - && is_callable_v>> -inline producer_with_next_error_done< - Value, - Error, - OnNext, - OnError, - OnDone> operator|( - producer_with_next_error< - Value, - Error, - OnNext, - OnError> &&producer_with_next_error, - done_holder &&handler) { - return { - std::move(producer_with_next_error.bound), - std::move(producer_with_next_error.next), - std::move(producer_with_next_error.error), - std::move(handler.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v - && is_callable_v>> -inline producer_with_next_error_done< - Value, - Error, - OnNext, - OnError, - OnDone> operator|( - producer_with_next_done< - Value, - Error, - OnNext, - OnDone> &&producer_with_next_done, - error_holder &&handler) { - return { - std::move(producer_with_next_done.bound), - std::move(producer_with_next_done.next), - std::move(handler.error), - std::move(producer_with_next_done.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename OnDone, - typename = std::enable_if_t< - is_callable_v - && is_callable_v - && is_callable_v>> -inline producer_with_next_error_done< - Value, - Error, - OnNext, - OnError, - OnDone> operator|( - producer_with_error_done< - Value, - Error, - OnError, - OnDone> &&producer_with_error_done, - next_holder &&handler) { - return { - std::move(producer_with_error_done.bound), - std::move(handler.next), - std::move(producer_with_error_done.error), - std::move(producer_with_error_done.done) }; -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename OnDone> -inline void operator|( - producer_with_next_error_done< - Value, - Error, - OnNext, - OnError, - OnDone> &&producer_with_next_error_done, - lifetime_holder &&lifetime) { - lifetime.alive_while.add( - std::move(producer_with_next_error_done.bound).start( - std::move(producer_with_next_error_done.next), - std::move(producer_with_next_error_done.error), - std::move(producer_with_next_error_done.done))); -} - template inline void operator|( producer &&value, - lifetime_holder &&start_with_lifetime) { - return std::move(value) - | on_next([](const Value&) {}) - | on_error([](const Error&) {}) - | on_done([] {}) - | std::move(start_with_lifetime); -} - -template -inline void operator|( - producer_with_next< - Value, - Error, - OnNext> &&producer_with_next, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_next) - | on_error([](const Error&) {}) - | on_done([] {}) - | std::move(start_with_lifetime); -} - -template -inline void operator|( - producer_with_error< - Value, - Error, - OnError> &&producer_with_error, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_error) - | on_next([](const Value&) {}) - | on_done([] {}) - | std::move(start_with_lifetime); -} - -template -inline void operator|( - producer_with_done< - Value, - Error, - OnDone> &&producer_with_done, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_done) - | on_next([](const Value&) {}) - | on_error([](const Error&) {}) - | std::move(start_with_lifetime); + lifetime_with_none &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + [](const Value&) {}, + [](const Error&) {}, + [] {})); } template < typename Value, typename Error, typename OnNext, - typename OnError> + typename = std::enable_if_t>> inline void operator|( - producer_with_next_error< - Value, - Error, - OnNext, - OnError> &&producer_with_next_error, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_next_error) - | on_done([] {}) - | std::move(start_with_lifetime); -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnDone> -inline void operator|( - producer_with_next_done< - Value, - Error, - OnNext, - OnDone> &&producer_with_next_done, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_next_done) - | on_error([](const Error&) {}) - | std::move(start_with_lifetime); + producer &&value, + lifetime_with_next &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + std::move(lifetime.next), + [](const Error&) {}, + [] {})); } template < typename Value, typename Error, typename OnError, - typename OnDone> + typename = std::enable_if_t>> inline void operator|( - producer_with_error_done< - Value, - Error, + producer &&value, + lifetime_with_error &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + [](const Value&) {}, + std::move(lifetime.error), + [] {})); +} + +template < + typename Value, + typename Error, + typename OnDone, + typename = std::enable_if_t>> +inline void operator|( + producer &&value, + lifetime_with_done &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + [](const Value&) {}, + [](const Error&) {}, + std::move(lifetime.done))); +} + +template < + typename Value, + typename Error, + typename OnNext, + typename OnError, + typename = std::enable_if_t< + is_callable_v && + is_callable_v>> +inline void operator|( + producer &&value, + lifetime_with_next_error &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + std::move(lifetime.next), + std::move(lifetime.error), + [] {})); +} + +template < + typename Value, + typename Error, + typename OnError, + typename OnDone, + typename = std::enable_if_t< + is_callable_v && + is_callable_v>> +inline void operator|( + producer &&value, + lifetime_with_error_done &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + [](const Value&) {}, + std::move(lifetime.error), + std::move(lifetime.done))); +} + +template < + typename Value, + typename Error, + typename OnNext, + typename OnDone, + typename = std::enable_if_t< + is_callable_v && + is_callable_v>> +inline void operator|( + producer &&value, + lifetime_with_next_done &&lifetime) { + lifetime.alive_while.add( + std::move(value).start( + std::move(lifetime.next), + [](const Error&) {}, + std::move(lifetime.done))); +} + +template < + typename Value, + typename Error, + typename OnNext, + typename OnError, + typename OnDone, + typename = std::enable_if_t< + is_callable_v && + is_callable_v && + is_callable_v>> +inline void operator|( + producer &&value, + lifetime_with_next_error_done< + OnNext, OnError, - OnDone> &&producer_with_error_done, - lifetime_holder &&start_with_lifetime) { - return std::move(producer_with_error_done) - | on_next([](const Value&) {}) - | std::move(start_with_lifetime); -} - -template < - typename Value, - typename Error, - typename Callback1, - typename = std::enable_if_t< - is_callable_v -// || is_callable_v - || is_callable_v - >> -inline void operator|( - producer &&value, - lifetime_holder_1 &&start_with_lifetime) { - using callback1_type = std::integral_constant ? CallbackType::Next : -// is_callable_v ? CallbackType::Error : - is_callable_v ? CallbackType::Done : - CallbackType::Invalid>; - start_with_lifetime.alive_while.add( + OnDone> &&lifetime) { + lifetime.alive_while.add( std::move(value).start( - on_next_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - on_error_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - on_done_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}))); -} - -template < - typename Value, - typename Error, - typename OnNext, - typename Callback1, - typename = std::enable_if_t< - is_callable_v - || is_callable_v - >> -inline void operator|( - producer_with_next &&producer_with_next, - lifetime_holder_1 &&start_with_lifetime) { - using callback1_type = std::integral_constant ? CallbackType::Error : - is_callable_v ? CallbackType::Done : - CallbackType::Invalid>; - start_with_lifetime.alive_while.add( - std::move(producer_with_next.bound).start( - std::move(producer_with_next.next), - on_error_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - on_done_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}))); -} - -template < - typename Value, - typename Error, - typename OnError, - typename Callback1, - typename = std::enable_if_t< - is_callable_v - || is_callable_v - >> -inline void operator|( - producer_with_error &&producer_with_error, - lifetime_holder_1 &&start_with_lifetime) { - using callback1_type = std::integral_constant ? CallbackType::Next : - is_callable_v ? CallbackType::Done : - CallbackType::Invalid>; - start_with_lifetime.alive_while.add( - std::move(producer_with_error.bound).start( - on_next_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - std::move(producer_with_error.error), - on_done_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}))); -} - -template < - typename Value, - typename Error, - typename OnDone, - typename Callback1, - typename = std::enable_if_t< - is_callable_v -// || is_callable_v - >> -inline void operator|( - producer_with_done &&producer_with_done, - lifetime_holder_1 &&start_with_lifetime) { - using callback1_type = std::integral_constant ? CallbackType::Next : -// is_callable_v ? CallbackType::Error : - CallbackType::Invalid>; - start_with_lifetime.alive_while.add( - std::move(producer_with_done.bound).start( - on_next_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - on_error_dispatch(std::move(start_with_lifetime.callback1), callback1_type{}), - std::move(producer_with_done.done))); -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnError, - typename Callback1, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_next_error &&producer_with_next_error, - lifetime_holder_1 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_next_error.bound).start( - std::move(producer_with_next_error.next), - std::move(producer_with_next_error.error), - std::move(start_with_lifetime.callback1))); -} - -template < - typename Value, - typename Error, - typename OnNext, - typename OnDone, - typename Callback1, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_next_done &&producer_with_next_done, - lifetime_holder_1 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_next_done.bound).start( - std::move(producer_with_next_done.next), - std::move(start_with_lifetime.callback1), - std::move(producer_with_next_done.done))); -} - -template < - typename Value, - typename Error, - typename OnError, - typename OnDone, - typename Callback1, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_error_done &&producer_with_error_done, - lifetime_holder_1 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_error_done.bound).start( - std::move(start_with_lifetime.callback1), - std::move(producer_with_error_done.error), - std::move(producer_with_error_done.done))); -} - -template < - typename Value, - typename Error, - typename Callback1, - typename Callback2, - typename = std::enable_if_t< - (is_callable_v && is_callable_v) - || (is_callable_v && is_callable_v) -// || (is_callable_v && is_callable_v) - >> -inline void operator|( - producer &&value, - lifetime_holder_2 &&start_with_lifetime) { - using callbacks_type = std::integral_constant && is_callable_v) ? CallbacksType::NextError : - (is_callable_v && is_callable_v) ? CallbacksType::NextDone : -// (is_callable_v && is_callable_v) ? CallbacksType::ErrorDone : - CallbacksType::Invalid>; - start_with_lifetime.alive_while.add( - std::move(value).start( - on_next_dispatch(std::move(start_with_lifetime.callback1), callbacks_type{}), - on_error_dispatch(std::move(start_with_lifetime.callback1), std::move(start_with_lifetime.callback2), callbacks_type{}), - on_done_dispatch(std::move(start_with_lifetime.callback2), callbacks_type{}))); -} - -template < - typename Value, - typename Error, - typename OnNext, - typename Callback1, - typename Callback2, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_next &&producer_with_next, - lifetime_holder_2 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_next.bound).start( - std::move(producer_with_next.next), - std::move(start_with_lifetime.callback1), - std::move(start_with_lifetime.callback2))); -} - -template < - typename Value, - typename Error, - typename OnError, - typename Callback1, - typename Callback2, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_error &&producer_with_error, - lifetime_holder_2 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_error.bound).start( - std::move(start_with_lifetime.callback1), - std::move(producer_with_error.error), - std::move(start_with_lifetime.callback2))); -} - -template < - typename Value, - typename Error, - typename OnDone, - typename Callback1, - typename Callback2, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer_with_done &&producer_with_done, - lifetime_holder_2 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(producer_with_done.bound).start( - std::move(start_with_lifetime.callback1), - std::move(start_with_lifetime.callback2), - std::move(producer_with_done.done))); -} - -template < - typename Value, - typename Error, - typename Callback1, - typename Callback2, - typename Callback3, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>, - typename = std::enable_if_t< - is_callable_v>> -inline void operator|( - producer &&value, - lifetime_holder_3 &&start_with_lifetime) { - start_with_lifetime.alive_while.add( - std::move(value).start( - std::move(start_with_lifetime.callback1), - std::move(start_with_lifetime.callback2), - std::move(start_with_lifetime.callback3))); + std::move(lifetime.next), + std::move(lifetime.error), + std::move(lifetime.done))); } } // namespace details diff --git a/Telegram/SourceFiles/rpl/producer_tests.cpp b/Telegram/SourceFiles/rpl/producer_tests.cpp index 16e7c7bd9..41de8363e 100644 --- a/Telegram/SourceFiles/rpl/producer_tests.cpp +++ b/Telegram/SourceFiles/rpl/producer_tests.cpp @@ -322,9 +322,10 @@ TEST_CASE("basic event_streams tests", "[rpl::event_stream]") { lifetime extended; { event_stream stream; - stream.events() | on_next([=](int value) { - *sum += value; - }) | start(extended); + stream.events() + | start_with_next([=](int value) { + *sum += value; + }, extended); stream.fire(1); stream.fire(2); @@ -338,37 +339,8 @@ TEST_CASE("basic event_streams tests", "[rpl::event_stream]") { } TEST_CASE("basic piping tests", "[rpl::producer]") { - SECTION("bind_on_next, bind_on_error, bind_on_done") { - auto sum = std::make_shared(0); - auto doneGenerated = std::make_shared(false); - { - auto alive = lifetime(); - producer([=](auto &&consumer) { - consumer.put_next(1); - consumer.put_next(2); - consumer.put_next(3); - consumer.put_done(); - return lifetime(); - }) | bind_on_next([=](int value) { - *sum += value; - }) | bind_on_done([=]() { - *doneGenerated = true; - }) | start(alive); - producer([=](auto &&consumer) { - consumer.put_error(4); - return lifetime(); - }) | bind_on_error([=](int value) { - *sum += value; - }) | bind_on_done([=]() { - *doneGenerated = false; - }) | start(alive); - } - REQUIRE(*sum == 1 + 2 + 3 + 4); - REQUIRE(*doneGenerated); - } - - SECTION("on_next, on_error, on_done") { + SECTION("start_with_*") { auto sum = std::make_shared(0); auto dones = std::make_shared(0); { @@ -377,25 +349,25 @@ TEST_CASE("basic piping tests", "[rpl::producer]") { consumer.put_next(1); consumer.put_done(); return lifetime(); - }) | on_next([=](int value) { + }) | start_with_next([=](int value) { *sum += value; - }) | start(alive); + }, alive); producer([=](auto &&consumer) { consumer.put_next(11); consumer.put_error(111); return lifetime(); - }) | on_error([=](int value) { + }) | start_with_error([=](int value) { *sum += value; - }) | start(alive); + }, alive); producer([=](auto &&consumer) { consumer.put_next(1111); consumer.put_done(); return lifetime(); - }) | on_done([=]() { + }) | start_with_done([=]() { *dones += 1; - }) | start(alive); + }, alive); producer([=](auto &&consumer) { consumer.put_next(11111); @@ -403,11 +375,11 @@ TEST_CASE("basic piping tests", "[rpl::producer]") { consumer.put_next(11113); consumer.put_error(11114); return lifetime(); - }) | on_next([=](int value) { + }) | start_with_next_error([=](int value) { *sum += value; - }) | on_error([=](int value) { + }, [=](int value) { *sum += value; - }) | start(alive); + }, alive); } auto alive = lifetime(); @@ -417,31 +389,46 @@ TEST_CASE("basic piping tests", "[rpl::producer]") { consumer.put_next(111113); consumer.put_done(); return lifetime(); - }) | on_next([=](int value) { + }) | start_with_next_done([=](int value) { *sum += value; - }) | on_done([=]() { + }, [=]() { *dones += 11; - }) | start(alive); + }, alive); producer([=](auto &&consumer) { consumer.put_error(1111111); return lifetime(); - }) | on_error([=](int value) { + }) | start_with_error_done([=](int value) { *sum += value; - }) | on_done([=]() { + }, [=]() { *dones = 0; - }) | start(alive); + }, alive); + + producer([=](auto &&consumer) { + consumer.put_next(11111111); + consumer.put_next(11111112); + consumer.put_next(11111113); + consumer.put_error(11111114); + return lifetime(); + }) | start_with_next_error_done([=](int value) { + *sum += value; + }, [=](int value) { + *sum += value; + }, [=]() { + *dones = 0; + }, alive); REQUIRE(*sum == 1 + 111 + 11111 + 11112 + 11113 + 11114 + 111111 + 111112 + 111113 + - 1111111); + 1111111 + + 11111111 + 11111112 + 11111113 + 11111114); REQUIRE(*dones == 1 + 11); } - SECTION("on_next should copy its callback") { + SECTION("start_with_next should copy its callback") { auto sum = std::make_shared(0); { auto next = [=](int value) { @@ -455,42 +442,9 @@ TEST_CASE("basic piping tests", "[rpl::producer]") { consumer.put_next(1); consumer.put_done(); return lifetime(); - }) - | on_next(next) - | start(alive); + }) | start_with_next(next, alive); } } REQUIRE(*sum == 3); } - - SECTION("rich start calls") { - auto sum = std::make_shared(0); - { - auto alive = lifetime(); - producer([=](auto &&consumer) { - consumer.put_next(33); - return lifetime(); - }) - | start([=](int value) { - *sum += value; - }, alive); - producer([=](auto &&consumer) { - consumer.put_error(33); - return lifetime(); - }) - | start([](no_value) { - }, [=](int value) { - *sum += value; - }, alive); - producer([=](auto &&consumer) { - consumer.put_next(33); - consumer.put_done(); - return lifetime(); - }) - | start([=] { - *sum += 33; - }, alive); - } - REQUIRE(*sum == 99); - } } diff --git a/Telegram/SourceFiles/rpl/variable.h b/Telegram/SourceFiles/rpl/variable.h index 03d1c5b41..d93e58ea1 100644 --- a/Telegram/SourceFiles/rpl/variable.h +++ b/Telegram/SourceFiles/rpl/variable.h @@ -66,7 +66,7 @@ public: std::is_assignable_v>> variable(rpl::producer &&stream) { std::move(stream) - | start([this](auto &&data) { + | start_with_next([this](auto &&data) { *this = std::forward(data); }, _lifetime); } @@ -78,7 +78,7 @@ public: variable &operator=(rpl::producer &&stream) { _lifetime.destroy(); std::move(stream) - | start([this](auto &&data) { + | start_with_next([this](auto &&data) { *this = std::forward(data); }, _lifetime); } diff --git a/Telegram/SourceFiles/settings/settings_block_widget.cpp b/Telegram/SourceFiles/settings/settings_block_widget.cpp index fa20dac07..696fedc74 100644 --- a/Telegram/SourceFiles/settings/settings_block_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_block_widget.cpp @@ -32,7 +32,7 @@ BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title) , _self(self) , _title(title) { _content->heightValue() - | rpl::start([this](int contentHeight) { + | rpl::start_with_next([this](int contentHeight) { resize( width(), contentTop() diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.cpp b/Telegram/SourceFiles/settings/settings_inner_widget.cpp index 460fa3619..7f427b044 100644 --- a/Telegram/SourceFiles/settings/settings_inner_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_inner_widget.cpp @@ -83,7 +83,7 @@ void InnerWidget::refreshBlocks() { } _blocks->show(); _blocks->heightValue() - | rpl::start([this](int blocksHeight) { + | rpl::start_with_next([this](int blocksHeight) { resize(width(), _blocks->y() + blocksHeight); }, lifetime()); } diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/settings/settings_layer.cpp index 3c20825fb..ae197ec5c 100644 --- a/Telegram/SourceFiles/settings/settings_layer.cpp +++ b/Telegram/SourceFiles/settings/settings_layer.cpp @@ -53,7 +53,7 @@ Layer::Layer() _scroll->scrollTopValue() | rpl::map([](int scrollTop) { return scrollTop > 0; }) | rpl::distinct_until_changed() - | rpl::start([this](bool scrolled) { + | rpl::start_with_next([this](bool scrolled) { _fixedBarShadow->toggleAnimated(scrolled); }, lifetime()); } @@ -73,7 +73,7 @@ void Layer::resizeToWidth(int newWidth, int newContentLeft) { void Layer::doSetInnerWidget(object_ptr widget) { _inner = _scroll->setOwnedWidget(std::move(widget)); _inner->heightValue() - | rpl::start([this](int innerHeight) { + | rpl::start_with_next([this](int innerHeight) { resizeUsingInnerHeight(width(), innerHeight); }, lifetime()); } diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp index 412156c58..2cfe7f78f 100644 --- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp @@ -61,7 +61,9 @@ void ScaleWidget::createControls() { _scale->addSection(scaleLabel(dbisTwo)); _scale->setActiveSectionFast(cEvalScale(cConfigScale()) - 1); _scale->sectionActivated() - | rpl::start([this](int) { scaleChanged(); }, lifetime()); + | rpl::start_with_next( + [this](int) { scaleChanged(); }, + lifetime()); } void ScaleWidget::onAutoChanged() { diff --git a/Telegram/SourceFiles/storage/storage_shared_media.cpp b/Telegram/SourceFiles/storage/storage_shared_media.cpp index 86617eb45..cf0479128 100644 --- a/Telegram/SourceFiles/storage/storage_shared_media.cpp +++ b/Telegram/SourceFiles/storage/storage_shared_media.cpp @@ -239,7 +239,8 @@ std::map::iterator auto type = static_cast(index); list.sliceUpdated() - | rpl::start([this, peer, type](const SliceUpdate &update) { + | rpl::start_with_next([this, peer, type]( + const SliceUpdate &update) { _sliceUpdated.fire(SharedMediaSliceUpdate( peer, type, diff --git a/Telegram/SourceFiles/storage/storage_user_photos.cpp b/Telegram/SourceFiles/storage/storage_user_photos.cpp index 6398a982f..4fa4d39b3 100644 --- a/Telegram/SourceFiles/storage/storage_user_photos.cpp +++ b/Telegram/SourceFiles/storage/storage_user_photos.cpp @@ -122,7 +122,8 @@ UserPhotos::enforceLists(UserId user) { } result = _lists.emplace(user, List {}).first; result->second.sliceUpdated( - ) | rpl::start([this, user](const SliceUpdate &update) { + ) | rpl::start_with_next([this, user]( + const SliceUpdate &update) { _sliceUpdated.fire(UserPhotosSliceUpdate( user, update.photoIds, diff --git a/Telegram/SourceFiles/ui/rp_widget.h b/Telegram/SourceFiles/ui/rp_widget.h index 53697428b..74dc57587 100644 --- a/Telegram/SourceFiles/ui/rp_widget.h +++ b/Telegram/SourceFiles/ui/rp_widget.h @@ -87,7 +87,7 @@ public: void showOn(rpl::producer &&shown) { std::move(shown) - | rpl::start([this](bool visible) { + | rpl::start_with_next([this](bool visible) { this->setVisible(visible); }, lifetime()); } diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp index 79c5aebb4..623be2c41 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.cpp +++ b/Telegram/SourceFiles/ui/widgets/labels.cpp @@ -172,7 +172,7 @@ FlatLabel::FlatLabel( , _contextCopyText(lang(lng_context_copy_text)) { textUpdated(); std::move(text) - | rpl::start([this](const QString &value) { + | rpl::start_with_next([this](const QString &value) { setText(value); }, lifetime()); } @@ -187,7 +187,7 @@ FlatLabel::FlatLabel( , _contextCopyText(lang(lng_context_copy_text)) { textUpdated(); std::move(text) - | rpl::start([this](const TextWithEntities &value) { + | rpl::start_with_next([this](const TextWithEntities &value) { setMarkedText(value); }, lifetime()); } diff --git a/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp b/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp index 1d34057c2..bc61931f4 100644 --- a/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp +++ b/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp @@ -85,7 +85,7 @@ SlideWrap *SlideWrap::finishAnimations() { SlideWrap *SlideWrap::toggleOn( rpl::producer &&shown) { std::move(shown) - | rpl::start([this](bool shown) { + | rpl::start_with_next([this](bool shown) { toggleAnimated(shown); }, lifetime()); finishAnimations(); diff --git a/Telegram/SourceFiles/ui/wrap/vertical_layout.cpp b/Telegram/SourceFiles/ui/wrap/vertical_layout.cpp index 1875a5d43..09114ae16 100644 --- a/Telegram/SourceFiles/ui/wrap/vertical_layout.cpp +++ b/Telegram/SourceFiles/ui/wrap/vertical_layout.cpp @@ -115,7 +115,7 @@ RpWidget *VerticalLayout::addChild( width() - margins.left() - margins.right(), height() - margins.top() - margins.bottom()); weak->heightValue() - | rpl::start([this, weak](int) { + | rpl::start_with_next_done([this, weak](int) { childHeightUpdated(weak); }, [this, weak] { removeChild(weak); diff --git a/Telegram/SourceFiles/ui/wrap/wrap.h b/Telegram/SourceFiles/ui/wrap/wrap.h index 89258ff1e..06dd62203 100644 --- a/Telegram/SourceFiles/ui/wrap/wrap.h +++ b/Telegram/SourceFiles/ui/wrap/wrap.h @@ -120,18 +120,17 @@ Wrap::Wrap(QWidget *parent, object_ptr child) , _wrapped(std::move(child)) { if (_wrapped) { _wrapped->sizeValue() - | rpl::start([this](const QSize &value) { + | rpl::start_with_next([this](const QSize &value) { wrappedSizeUpdated(value); }, lifetime()); AttachParentChild(this, _wrapped); _wrapped->move(0, 0); _wrapped->alive() - | rpl::on_done([this] { + | rpl::start_with_done([this] { _wrapped->setParent(nullptr); _wrapped = nullptr; delete this; - }) - | rpl::start(lifetime()); + }, lifetime()); } } diff --git a/Telegram/SourceFiles/window/player_wrap_widget.cpp b/Telegram/SourceFiles/window/player_wrap_widget.cpp index d35876a70..f7da9a457 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.cpp +++ b/Telegram/SourceFiles/window/player_wrap_widget.cpp @@ -27,7 +27,7 @@ namespace Window { PlayerWrapWidget::PlayerWrapWidget(QWidget *parent) : Parent(parent, object_ptr(parent)) { sizeValue() - | rpl::start([this](const QSize &size) { + | rpl::start_with_next([this](const QSize &size) { updateShadowGeometry(size); }, lifetime()); } diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp index 52d243e83..4b885ae53 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.cpp +++ b/Telegram/SourceFiles/window/top_bar_widget.cpp @@ -87,7 +87,7 @@ TopBarWidget::TopBarWidget( = (peer != nullptr) && (peer == searchPeer); return std::make_tuple(searchInPeer, peerChanged); }) - | rpl::start([this]( + | rpl::start_with_next([this]( bool searchInHistoryPeer, bool peerChanged) { auto animated = peerChanged @@ -118,7 +118,7 @@ TopBarWidget::TopBarWidget( rpl::combine( Auth().data().thirdSectionInfoEnabledValue(), Auth().data().tabbedReplacedWithInfoValue()) - | rpl::start( + | rpl::start_with_next( [this](auto&&) { updateInfoToggleActive(); }, lifetime());