diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp index 5a09f640c..9360b4732 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp @@ -30,7 +30,7 @@ namespace { using namespace Settings; -constexpr auto kMaxFilterTitleLength = 20; +constexpr auto kMaxFilterTitleLength = 12; using Flag = Data::ChatFilter::Flag; using Flags = Data::ChatFilter::Flags; diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp index c9d5d80d5..5740dc545 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp @@ -33,6 +33,11 @@ constexpr auto kAllTypes = { Flag::NoRead }; +struct RowSelectionChange { + not_null row; + bool checked = false; +}; + class TypeRow final : public PeerListRow { public: explicit TypeRow(Flag flag); @@ -79,7 +84,9 @@ public: void prepare() override; void rowClicked(not_null row) override; - [[nodiscard]] rpl::producer selectedOptions() const; + [[nodiscard]] rpl::producer selectedChanges() const; + [[nodiscard]] auto rowSelectionChanges() const + -> rpl::producer; private: [[nodiscard]] std::unique_ptr createRow(Flag flag) const; @@ -89,6 +96,7 @@ private: Flags _options; rpl::event_stream<> _selectionChanged; + rpl::event_stream _rowSelectionChanges; }; @@ -221,22 +229,27 @@ Flags TypeController::collectSelectedOptions() const { } void TypeController::rowClicked(not_null row) { - delegate()->peerListSetRowChecked(row, !row->checked()); - _selectionChanged.fire({}); + const auto checked = !row->checked(); + delegate()->peerListSetRowChecked(row, checked); + _rowSelectionChanges.fire({ row, checked }); } std::unique_ptr TypeController::createRow(Flag flag) const { return std::make_unique(flag); } -rpl::producer TypeController::selectedOptions() const { - return _selectionChanged.events_starting_with( - {} +rpl::producer TypeController::selectedChanges() const { + return _rowSelectionChanges.events( ) | rpl::map([=] { return collectSelectedOptions(); }); } +auto TypeController::rowSelectionChanges() const +-> rpl::producer { + return _rowSelectionChanges.events(); +} + } // namespace [[nodiscard]] QString FilterChatsTypeName(Flag flag) { @@ -326,11 +339,24 @@ void EditFilterChatsListController::itemDeselectedHook( updateTitle(); } +bool EditFilterChatsListController::isForeignRow(PeerListRowId itemId) { + return ranges::contains(kAllTypes, itemId, TypeId); +} + +bool EditFilterChatsListController::handleDeselectForeignRow( + PeerListRowId itemId) { + if (isForeignRow(itemId)) { + _deselectOption(itemId); + return true; + } + return false; +} + void EditFilterChatsListController::prepareViewHook() { delegate()->peerListSetTitle(std::move(_title)); + delegate()->peerListSetAboveWidget(prepareTypesList()); delegate()->peerListAddSelectedPeers( _peers | ranges::view::transform(&History::peer)); - delegate()->peerListSetAboveWidget(prepareTypesList()); } object_ptr EditFilterChatsListController::prepareTypesList() { @@ -354,6 +380,7 @@ object_ptr EditFilterChatsListController::prepareTypesList() { if (_selected & flag) { if (const auto row = delegate->peerListFindRow(TypeId(flag))) { content->changeCheckState(row, true, anim::type::instant); + this->delegate()->peerListSetForeignRowChecked(row, true); } } } @@ -361,11 +388,24 @@ object_ptr EditFilterChatsListController::prepareTypesList() { container, tr::lng_filters_edit_chats())); - controller->selectedOptions( + controller->selectedChanges( ) | rpl::start_with_next([=](Flags selected) { _selected = selected; }, _lifetime); + controller->rowSelectionChanges( + ) | rpl::start_with_next([=](RowSelectionChange update) { + this->delegate()->peerListSetForeignRowChecked( + update.row, + update.checked); + }, _lifetime); + + _deselectOption = [=](PeerListRowId itemId) { + if (const auto row = delegate->peerListFindRow(itemId)) { + delegate->peerListSetRowChecked(row, false); + } + }; + return result; } diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h index a4eae9fb1..e993cafb7 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h @@ -54,6 +54,8 @@ public: void rowClicked(not_null row) override; void itemDeselectedHook(not_null peer) override; + bool isForeignRow(PeerListRowId itemId) override; + bool handleDeselectForeignRow(PeerListRowId itemId) override; private: void prepareViewHook() override; @@ -68,6 +70,8 @@ private: Flags _options; Flags _selected; + Fn _deselectOption; + rpl::lifetime _lifetime; }; diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index b66588509..3e1042993 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -74,6 +74,9 @@ void PeerListBox::createMultiSelect() { searchQueryChanged(query); }); _select->entity()->setItemRemovedCallback([=](uint64 itemId) { + if (_controller->handleDeselectForeignRow(itemId)) { + return; + } if (const auto peer = _controller->session().data().peerLoaded(itemId)) { if (const auto row = peerListFindRow(peer->id)) { content()->changeCheckState(row, false, anim::type::normal); @@ -198,6 +201,20 @@ void PeerListBox::peerListSetRowChecked( } } +void PeerListBox::peerListSetForeignRowChecked( + not_null row, + bool checked) { + if (checked) { + addSelectItem(row, anim::type::normal); + + // This call deletes row from _searchRows. + _select->entity()->clearQuery(); + } else { + // The itemRemovedCallback will call changeCheckState() here. + _select->entity()->removeItem(row->id()); + } +} + void PeerListBox::peerListScrollToTop() { onScrollToY(0); } @@ -364,7 +381,9 @@ auto PeerListBox::peerListCollectSelectedRows() if (!items.empty()) { result.reserve(items.size()); for (const auto itemId : items) { - result.push_back(_controller->session().data().peer(itemId)); + if (!_controller->isForeignRow(itemId)) { + result.push_back(_controller->session().data().peer(itemId)); + } } } return result; diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h index df5027fb2..f3ab5df0e 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.h +++ b/Telegram/SourceFiles/boxes/peer_list_box.h @@ -271,6 +271,7 @@ public: virtual void peerListConvertRowToSearchResult(not_null row) = 0; virtual bool peerListIsRowChecked(not_null row) = 0; virtual void peerListSetRowChecked(not_null row, bool checked) = 0; + virtual void peerListSetForeignRowChecked(not_null row, bool checked) = 0; virtual not_null peerListRowAt(int index) = 0; virtual void peerListRefreshRows() = 0; virtual void peerListScrollToTop() = 0; @@ -378,6 +379,12 @@ public: } virtual void itemDeselectedHook(not_null peer) { } + virtual bool isForeignRow(PeerListRowId itemId) { + return false; + } + virtual bool handleDeselectForeignRow(PeerListRowId itemId) { + return false; + } virtual base::unique_qptr rowContextMenu( QWidget *parent, not_null row); @@ -715,6 +722,10 @@ public: bool checked) override { _content->changeCheckState(row, checked, anim::type::normal); } + void peerListSetForeignRowChecked( + not_null row, + bool checked) override { + } int peerListFullRowsCount() override { return _content->fullRowsCount(); } @@ -803,6 +814,9 @@ public: void peerListSetRowChecked( not_null row, bool checked) override; + void peerListSetForeignRowChecked( + not_null row, + bool checked) override; bool peerListIsRowChecked(not_null row) override; int peerListSelectedRowsCount() override; std::vector> peerListCollectSelectedRows() override;