Edit chat types in filters.

Telegram/SourceFiles/boxes/background_box.cpp

@@ -185,7 +185,7 @@ BackgroundBox::Inner::Inner(
 , _session(session)
 , _api(_session->api().instance())
 , _check(std::make_unique<Ui::RoundCheckbox>(st::overviewCheck, [=] { update(); })) {
-	_check->setChecked(true, Ui::RoundCheckbox::SetStyle::Fast);
+	_check->setChecked(true, anim::type::instant);
 	if (_session->data().wallpapers().empty()) {
 		resize(st::boxWideWidth, 2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
 	} else {

Telegram/SourceFiles/boxes/boxes.style

@@ -216,26 +216,9 @@ contactsMultiSelect: MultiSelect {
 	fieldCancel: contactsSearchCancel;
 	fieldCancelSkip: 40px;
 }
-contactsPhotoCheckIcon: icon {{
+contactsPhotoCheckIcon: defaultPeerListCheckIcon;
-	"default_checkbox_check",
+contactsPhotoCheck: defaultPeerListCheck;
-	overviewCheckFgActive,
+contactsPhotoCheckbox: defaultPeerListCheckbox;
-	point(3px, 6px)
-}};
-contactsPhotoCheck: RoundCheckbox(defaultRoundCheckbox) {
-	size: 20px;
-	sizeSmall: 0.3;
-	bgInactive: overviewCheckBg;
-	bgActive: overviewCheckBgActive;
-	check: contactsPhotoCheckIcon;
-}
-contactsPhotoCheckbox: RoundImageCheckbox {
-	imageRadius: 21px;
-	imageSmallRadius: 18px;
-	selectWidth: 2px;
-	selectFg: windowBgActive;
-	selectDuration: 150;
-	check: contactsPhotoCheck;
-}
 contactsPhotoDisabledCheckFg: menuIconFg;
 contactsNameCheckedFg: windowActiveTextFg;
 contactsRipple: defaultRippleAnimation;

Telegram/SourceFiles/boxes/edit_privacy_box.cpp

@@ -69,7 +69,7 @@ Main::Session &PrivacyExceptionsBoxController::session() const {
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	delegate()->peerListAddSelectedRows(_selected);
+	delegate()->peerListAddSelectedPeers(_selected);
 }
 
 std::vector<not_null<PeerData*>> PrivacyExceptionsBoxController::getResult() const {

Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp

@@ -77,13 +77,9 @@ private:
 
 	void paintEvent(QPaintEvent *e) override;
 
-	void setup(
-		Flags flags,
-		const base::flat_set<not_null<History*>> &peers);
 	void refresh();
 	void removeFlag(Flag flag);
 	void removePeer(not_null<History*> history);
-	void paintFlagIcon(QPainter &p, int left, int top, Flag flag) const;
 
 	std::vector<FlagButton> _removeFlag;
 	std::vector<PeerButton> _removePeer;
@@ -187,21 +183,6 @@ int FilterChatsPreview::resizeGetHeight(int newWidth) {
 	return top;
 }
 
-[[nodiscard]] QString TypeName(Flag flag) {
-	switch (flag) {
-	case Flag::Contacts: return tr::lng_filters_type_contacts(tr::now);
-	case Flag::NonContacts:
-		return tr::lng_filters_type_non_contacts(tr::now);
-	case Flag::Groups: return tr::lng_filters_type_groups(tr::now);
-	case Flag::Channels: return tr::lng_filters_type_channels(tr::now);
-	case Flag::Bots: return tr::lng_filters_type_bots(tr::now);
-	case Flag::NoMuted: return tr::lng_filters_type_no_muted(tr::now);
-	case Flag::NoArchived: return tr::lng_filters_type_no_archived(tr::now);
-	case Flag::NoRead: return tr::lng_filters_type_no_read(tr::now);
-	}
-	Unexpected("Flag in TypeName.");
-}
-
 void FilterChatsPreview::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 	auto top = 0;
@@ -212,10 +193,20 @@ void FilterChatsPreview::paintEvent(QPaintEvent *e) {
 	p.setFont(st::windowFilterSmallItem.nameStyle.font);
 	const auto nameTop = st.namePosition.y();
 	for (const auto &[flag, button] : _removeFlag) {
-		paintFlagIcon(p, iconLeft, top + iconTop, flag);
+		PaintFilterChatsTypeIcon(
+			p,
+			flag,
+			iconLeft,
+			top + iconTop,
+			width(),
+			st.photoSize);
 
 		p.setPen(st::contactsNameFg);
-		p.drawTextLeft(nameLeft, top + nameTop, width(), TypeName(flag));
+		p.drawTextLeft(
+			nameLeft,
+			top + nameTop,
+			width(),
+			FilterChatsTypeName(flag));
 		top += st.height;
 	}
 	for (const auto &[history, button] : _removePeer) {
@@ -236,46 +227,6 @@ void FilterChatsPreview::paintEvent(QPaintEvent *e) {
 	}
 }
 
-void FilterChatsPreview::paintFlagIcon(
-		QPainter &p,
-		int left,
-		int top,
-		Flag flag) const {
-	const auto &color = [&]() -> const style::color& {
-		switch (flag) {
-		case Flag::Contacts: return st::historyPeer4UserpicBg;
-		case Flag::NonContacts: return st::historyPeer7UserpicBg;
-		case Flag::Groups: return st::historyPeer2UserpicBg;
-		case Flag::Channels: return st::historyPeer1UserpicBg;
-		case Flag::Bots: return st::historyPeer6UserpicBg;
-		case Flag::NoMuted: return st::historyPeer6UserpicBg;
-		case Flag::NoArchived: return st::historyPeer4UserpicBg;
-		case Flag::NoRead: return st::historyPeer7UserpicBg;
-		}
-		Unexpected("Flag in color paintFlagIcon.");
-	}();
-	const auto &icon = [&]() -> const style::icon& {
-		switch (flag) {
-		case Flag::Contacts: return st::windowFilterTypeContacts;
-		case Flag::NonContacts: return st::windowFilterTypeNonContacts;
-		case Flag::Groups: return st::windowFilterTypeGroups;
-		case Flag::Channels: return st::windowFilterTypeChannels;
-		case Flag::Bots: return st::windowFilterTypeBots;
-		case Flag::NoMuted: return st::windowFilterTypeNoMuted;
-		case Flag::NoArchived: return st::windowFilterTypeNoArchived;
-		case Flag::NoRead: return st::windowFilterTypeNoRead;
-		}
-		Unexpected("Flag in icon paintFlagIcon.");
-	}();
-	const auto size = st::windowFilterSmallItem.photoSize;
-	const auto rect = QRect(left, top, size, size);
-	auto hq = PainterHighQualityEnabler(p);
-	p.setBrush(color->b);
-	p.setPen(Qt::NoPen);
-	p.drawEllipse(rect);
-	icon.paintInCenter(p, rect);
-}
-
 void FilterChatsPreview::removeFlag(Flag flag) {
 	const auto i = ranges::find(_removeFlag, flag, &FlagButton::flag);
 	Assert(i != end(_removeFlag));
@@ -307,7 +258,16 @@ void EditExceptions(
 		not_null<Data::ChatFilter*> data,
 		Fn<void()> refresh) {
 	const auto include = (options & Flag::Contacts) != Flags(0);
-	const auto initBox = [=](not_null<PeerListBox*> box) {
+	auto controller = std::make_unique<EditFilterChatsListController>(
+		window,
+		(include
+			? tr::lng_filters_include_title()
+			: tr::lng_filters_exclude_title()),
+		options,
+		data->flags() & options,
+		include ? data->always() : data->never());
+	const auto rawController = controller.get();
+	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_settings_save(), crl::guard(context, [=] {
 			const auto peers = box->peerListCollectSelectedRows();
 			auto &&histories = ranges::view::all(
@@ -326,7 +286,7 @@ void EditExceptions(
 			*data = Data::ChatFilter(
 				data->id(),
 				data->title(),
-				data->flags(),
+				(data->flags() & ~options) | rawController->chosenOptions(),
 				include ? std::move(changed) : std::move(removeFrom),
 				include ? std::move(removeFrom) : std::move(changed));
 			refresh();
@@ -336,14 +296,7 @@ void EditExceptions(
 	};
 	window->window().show(
 		Box<PeerListBox>(
-			std::make_unique<EditFilterChatsListController>(
+			std::move(controller),
-				window,
-				(include
-					? tr::lng_filters_include_title()
-					: tr::lng_filters_exclude_title()),
-				options,
-				data->flags() & options,
-				include ? data->always() : data->never()),
 			std::move(initBox)),
 		Ui::LayerOption::KeepOther);
 }

Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp

@@ -10,13 +10,291 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "base/object_ptr.h"
+#include "styles/style_window.h"
 
 namespace {
 
 constexpr auto kMaxExceptions = 100;
 
+using Flag = Data::ChatFilter::Flag;
+using Flags = Data::ChatFilter::Flags;
+
+constexpr auto kAllTypes = {
+	Flag::Contacts,
+	Flag::NonContacts,
+	Flag::Groups,
+	Flag::Channels,
+	Flag::Bots,
+	Flag::NoMuted,
+	Flag::NoArchived,
+	Flag::NoRead
+};
+
+class TypeRow final : public PeerListRow {
+public:
+	explicit TypeRow(Flag flag);
+
+	QString generateName() override;
+	QString generateShortName() override;
+	void paintEntityUserpicLeft(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) override;
+
+private:
+	[[nodiscard]] Flag flag() const;
+
+};
+
+class TypeDelegate final : public PeerListContentDelegate {
+public:
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) override;
+
+};
+
+class TypeController final : public PeerListController {
+public:
+	TypeController(
+		not_null<Main::Session*> session,
+		Flags options,
+		Flags selected);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+	[[nodiscard]] rpl::producer<Flags> selectedOptions() const;
+
+private:
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(Flag flag) const;
+	[[nodiscard]] Flags collectSelectedOptions() const;
+
+	const not_null<Main::Session*> _session;
+	Flags _options;
+
+	rpl::event_stream<> _selectionChanged;
+
+};
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateSectionSubtitle(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> text) {
+	auto result = object_ptr<Ui::FixedHeightWidget>(
+		parent,
+		st::searchedBarHeight);
+
+	const auto raw = result.data();
+	raw->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		auto p = QPainter(raw);
+		p.fillRect(clip, st::searchedBarBg);
+	}, raw->lifetime());
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		std::move(text),
+		st::windowFilterChatsSectionSubtitle);
+	raw->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		const auto padding = st::windowFilterChatsSectionSubtitlePadding;
+		const auto available = width - padding.left() - padding.right();
+		label->resizeToNaturalWidth(available);
+		label->moveToLeft(padding.left(), padding.top(), width);
+	}, label->lifetime());
+
+	return result;
+}
+
+[[nodiscard]] uint64 TypeId(Flag flag) {
+	return PeerIdFakeShift | static_cast<uint64>(flag);
+}
+
+TypeRow::TypeRow(Flag flag) : PeerListRow(TypeId(flag)) {
+}
+
+QString TypeRow::generateName() {
+	return FilterChatsTypeName(flag());
+}
+
+QString TypeRow::generateShortName() {
+	return generateName();
+}
+
+void TypeRow::paintEntityUserpicLeft(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) {
+	PaintFilterChatsTypeIcon(p, flag(), x, y, outerWidth, size);
+}
+
+Flag TypeRow::flag() const {
+	return static_cast<Flag>(id() & 0xFF);
+}
+
+void TypeDelegate::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void TypeDelegate::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool TypeDelegate::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int TypeDelegate::peerListSelectedRowsCount() {
+	return 0;
+}
+
+auto TypeDelegate::peerListCollectSelectedRows()
+-> std::vector<not_null<PeerData*>> {
+	return {};
+}
+
+void TypeDelegate::peerListScrollToTop() {
+}
+
+void TypeDelegate::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void TypeDelegate::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void TypeDelegate::peerListFinishSelectedRowsBunch() {
+}
+
+void TypeDelegate::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+TypeController::TypeController(
+	not_null<Main::Session*> session,
+	Flags options,
+	Flags selected)
+: _session(session)
+, _options(options) {
+}
+
+Main::Session &TypeController::session() const {
+	return *_session;
+}
+
+void TypeController::prepare() {
+	for (const auto flag : kAllTypes) {
+		if (_options & flag) {
+			delegate()->peerListAppendRow(createRow(flag));
+		}
+	}
+	delegate()->peerListRefreshRows();
+}
+
+Flags TypeController::collectSelectedOptions() const {
+	auto result = Flags();
+	for (const auto flag : kAllTypes) {
+		if (const auto row = delegate()->peerListFindRow(TypeId(flag))) {
+			if (row->checked()) {
+				result |= flag;
+			}
+		}
+	}
+	return result;
+}
+
+void TypeController::rowClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListSetRowChecked(row, !row->checked());
+	_selectionChanged.fire({});
+}
+
+std::unique_ptr<PeerListRow> TypeController::createRow(Flag flag) const {
+	return std::make_unique<TypeRow>(flag);
+}
+
+rpl::producer<Flags> TypeController::selectedOptions() const {
+	return _selectionChanged.events_starting_with(
+		{}
+	) | rpl::map([=] {
+		return collectSelectedOptions();
+	});
+}
+
 } // namespace
 
+[[nodiscard]] QString FilterChatsTypeName(Flag flag) {
+	switch (flag) {
+	case Flag::Contacts: return tr::lng_filters_type_contacts(tr::now);
+	case Flag::NonContacts:
+		return tr::lng_filters_type_non_contacts(tr::now);
+	case Flag::Groups: return tr::lng_filters_type_groups(tr::now);
+	case Flag::Channels: return tr::lng_filters_type_channels(tr::now);
+	case Flag::Bots: return tr::lng_filters_type_bots(tr::now);
+	case Flag::NoMuted: return tr::lng_filters_type_no_muted(tr::now);
+	case Flag::NoArchived: return tr::lng_filters_type_no_archived(tr::now);
+	case Flag::NoRead: return tr::lng_filters_type_no_read(tr::now);
+	}
+	Unexpected("Flag in TypeName.");
+}
+
+void PaintFilterChatsTypeIcon(
+		Painter &p,
+		Data::ChatFilter::Flag flag,
+		int x,
+		int y,
+		int outerWidth,
+		int size) {
+	const auto &color = [&]() -> const style::color& {
+		switch (flag) {
+		case Flag::Contacts: return st::historyPeer4UserpicBg;
+		case Flag::NonContacts: return st::historyPeer7UserpicBg;
+		case Flag::Groups: return st::historyPeer2UserpicBg;
+		case Flag::Channels: return st::historyPeer1UserpicBg;
+		case Flag::Bots: return st::historyPeer6UserpicBg;
+		case Flag::NoMuted: return st::historyPeer6UserpicBg;
+		case Flag::NoArchived: return st::historyPeer4UserpicBg;
+		case Flag::NoRead: return st::historyPeer7UserpicBg;
+		}
+		Unexpected("Flag in color paintFlagIcon.");
+	}();
+	const auto &icon = [&]() -> const style::icon& {
+		switch (flag) {
+		case Flag::Contacts: return st::windowFilterTypeContacts;
+		case Flag::NonContacts: return st::windowFilterTypeNonContacts;
+		case Flag::Groups: return st::windowFilterTypeGroups;
+		case Flag::Channels: return st::windowFilterTypeChannels;
+		case Flag::Bots: return st::windowFilterTypeBots;
+		case Flag::NoMuted: return st::windowFilterTypeNoMuted;
+		case Flag::NoArchived: return st::windowFilterTypeNoArchived;
+		case Flag::NoRead: return st::windowFilterTypeNoRead;
+		}
+		Unexpected("Flag in icon paintFlagIcon.");
+	}();
+	const auto rect = style::rtlrect(x, y, size, size, outerWidth);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(color->b);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(rect);
+	icon.paintInCenter(p, rect);
+}
+
 EditFilterChatsListController::EditFilterChatsListController(
 	not_null<Window::SessionNavigation*> navigation,
 	rpl::producer<QString> title,
@@ -26,7 +304,9 @@ EditFilterChatsListController::EditFilterChatsListController(
 : ChatsListBoxController(navigation)
 , _navigation(navigation)
 , _title(std::move(title))
-, _peers(peers) {
+, _peers(peers)
+, _options(options)
+, _selected(selected) {
 }
 
 Main::Session &EditFilterChatsListController::session() const {
@@ -48,8 +328,45 @@ void EditFilterChatsListController::itemDeselectedHook(
 
 void EditFilterChatsListController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	delegate()->peerListAddSelectedRows(
+	delegate()->peerListAddSelectedPeers(
 		_peers | ranges::view::transform(&History::peer));
+	delegate()->peerListSetAboveWidget(prepareTypesList());
+}
+
+object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+	container->add(CreateSectionSubtitle(
+		container,
+		tr::lng_filters_edit_types()));
+	const auto delegate = container->lifetime().make_state<TypeDelegate>();
+	const auto controller = container->lifetime().make_state<TypeController>(
+		&session(),
+		_options,
+		_selected);
+	const auto content = result->add(object_ptr<PeerListContent>(
+		container,
+		controller,
+		st::windowFilterSmallList));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+	for (const auto flag : kAllTypes) {
+		if (_selected & flag) {
+			if (const auto row = delegate->peerListFindRow(TypeId(flag))) {
+				content->changeCheckState(row, true, anim::type::instant);
+			}
+		}
+	}
+	container->add(CreateSectionSubtitle(
+		container,
+		tr::lng_filters_edit_chats()));
+
+	controller->selectedOptions(
+	) | rpl::start_with_next([=](Flags selected) {
+		_selected = selected;
+	}, _lifetime);
+
+	return result;
 }
 
 auto EditFilterChatsListController::createRow(not_null<History*> history)
@@ -60,7 +377,5 @@ auto EditFilterChatsListController::createRow(not_null<History*> history)
 void EditFilterChatsListController::updateTitle() {
 	const auto count = delegate()->peerListSelectedRowsCount();
 	const auto additional = qsl("%1 / %2").arg(count).arg(kMaxExceptions);
-	delegate()->peerListSetTitle(tr::lng_profile_add_participant());
 	delegate()->peerListSetAdditionalTitle(rpl::single(additional));
-
 }

Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h

@@ -24,6 +24,17 @@ namespace Main {
 class Session;
 } // namespace Main
 
+class Painter;
+
+[[nodiscard]] QString FilterChatsTypeName(Data::ChatFilter::Flag flag);
+void PaintFilterChatsTypeIcon(
+	Painter &p,
+	Data::ChatFilter::Flag flag,
+	int x,
+	int y,
+	int outerWidth,
+	int size);
+
 class EditFilterChatsListController final : public ChatsListBoxController {
 public:
 	using Flag = Data::ChatFilter::Flag;
@@ -36,20 +47,27 @@ public:
 		Flags selected,
 		const base::flat_set<not_null<History*>> &peers);
 
-	Main::Session &session() const override;
+	[[nodiscard]] Main::Session &session() const override;
+	[[nodiscard]] Flags chosenOptions() const {
+		return _selected;
+	}
 
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void itemDeselectedHook(not_null<PeerData*> peer) override;
 
-protected:
+private:
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+	[[nodiscard]] object_ptr<Ui::RpWidget> prepareTypesList();
 
-private:
 	void updateTitle();
 
 	const not_null<Window::SessionNavigation*> _navigation;
 	rpl::producer<QString> _title;
 	base::flat_set<not_null<History*>> _peers;
+	Flags _options;
+	Flags _selected;
+
+	rpl::lifetime _lifetime;
 
 };

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -33,10 +33,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <rpl/range.h>
 
-auto PaintUserpicCallback(
+PaintRoundImageCallback PaintUserpicCallback(
-	not_null<PeerData*> peer,
+		not_null<PeerData*> peer,
-	bool respectSavedMessagesChat)
+		bool respectSavedMessagesChat) {
--> Fn<void(Painter &p, int x, int y, int outerWidth, int size)> {
 	if (respectSavedMessagesChat && peer->isSelf()) {
 		return [](Painter &p, int x, int y, int outerWidth, int size) {
 			Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
@@ -77,7 +76,7 @@ void PeerListBox::createMultiSelect() {
 	_select->entity()->setItemRemovedCallback([=](uint64 itemId) {
 		if (const auto peer = _controller->session().data().peerLoaded(itemId)) {
 			if (const auto row = peerListFindRow(peer->id)) {
-				content()->changeCheckState(row, false, PeerListRow::SetStyle::Animated);
+				content()->changeCheckState(row, false, anim::type::normal);
 				update();
 			}
 			_controller->itemDeselectedHook(peer);
@@ -185,9 +184,8 @@ void PeerListBox::setInnerFocus() {
 void PeerListBox::peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) {
-	auto peer = row->peer();
 	if (checked) {
-		addSelectItem(peer, PeerListRow::SetStyle::Animated);
+		addSelectItem(row, anim::type::normal);
 		PeerListContentDelegate::peerListSetRowChecked(row, checked);
 		peerListUpdateRow(row);
 
@@ -195,7 +193,7 @@ void PeerListBox::peerListSetRowChecked(
 		_select->entity()->clearQuery();
 	} else {
 		// The itemRemovedCallback will call changeCheckState() here.
-		_select->entity()->removeItem(peer->id);
+		_select->entity()->removeItem(row->id());
 		peerListUpdateRow(row);
 	}
 }
@@ -295,38 +293,62 @@ int PeerListController::contentWidth() const {
 	return st::boxWideWidth;
 }
 
-void PeerListBox::addSelectItem(not_null<PeerData*> peer, PeerListRow::SetStyle style) {
+void PeerListBox::addSelectItem(
-	if (!_select) {
+		not_null<PeerData*> peer,
-		createMultiSelect();
+		anim::type animated) {
-		_select->hide(anim::type::instant);
-	}
 	const auto respect = _controller->respectSavedMessagesChat();
 	const auto text = (respect && peer->isSelf())
 		? tr::lng_saved_short(tr::now)
 		: peer->shortName();
-	const auto callback = PaintUserpicCallback(peer, respect);
+	addSelectItem(
-	if (style == PeerListRow::SetStyle::Fast) {
+		peer->id,
+		text,
+		PaintUserpicCallback(peer, respect),
+		animated);
+}
+
+void PeerListBox::addSelectItem(
+		not_null<PeerListRow*> row,
+		anim::type animated) {
+	addSelectItem(
+		row->id(),
+		row->generateShortName(),
+		row->generatePaintUserpicCallback(),
+		animated);
+}
+
+void PeerListBox::addSelectItem(
+		uint64 itemId,
+		const QString &text,
+		Ui::MultiSelect::PaintRoundImage paintUserpic,
+		anim::type animated) {
+	if (!_select) {
+		createMultiSelect();
+		_select->hide(anim::type::instant);
+	}
+	if (animated == anim::type::instant) {
 		_select->entity()->addItemInBunch(
-			peer->id,
+			itemId,
 			text,
 			st::activeButtonBg,
-			std::move(callback));
+			std::move(paintUserpic));
 	} else {
 		_select->entity()->addItem(
-			peer->id,
+			itemId,
 			text,
 			st::activeButtonBg,
-			std::move(callback));
+			std::move(paintUserpic));
 	}
 }
 
 void PeerListBox::peerListFinishSelectedRowsBunch() {
 	Expects(_select != nullptr);
+
 	_select->entity()->finishItemsBunch();
 }
 
-bool PeerListBox::peerListIsRowSelected(not_null<PeerData*> peer) {
+bool PeerListBox::peerListIsRowChecked(not_null<PeerListRow*> row) {
-	return _select ? _select->entity()->hasItem(peer->id) : false;
+	return _select ? _select->entity()->hasItem(row->id()) : false;
 }
 
 int PeerListBox::peerListSelectedRowsCount() {
@@ -348,7 +370,8 @@ auto PeerListBox::peerListCollectSelectedRows()
 	return result;
 }
 
-PeerListRow::PeerListRow(not_null<PeerData*> peer) : PeerListRow(peer, peer->id) {
+PeerListRow::PeerListRow(not_null<PeerData*> peer)
+: PeerListRow(peer, peer->id) {
 }
 
 PeerListRow::PeerListRow(not_null<PeerData*> peer, PeerListRowId id)
@@ -359,6 +382,15 @@ PeerListRow::PeerListRow(not_null<PeerData*> peer, PeerListRowId id)
 , _isSavedMessagesChat(false) {
 }
 
+PeerListRow::PeerListRow(PeerListRowId id)
+: _id(id)
+, _initialized(false)
+, _isSearchResult(false)
+, _isSavedMessagesChat(false) {
+}
+
+PeerListRow::~PeerListRow() = default;
+
 bool PeerListRow::checked() const {
 	return _checkbox && _checkbox->checked();
 }
@@ -375,7 +407,7 @@ void PeerListRow::clearCustomStatus() {
 }
 
 void PeerListRow::refreshStatus() {
-	if (!_initialized || _statusType == StatusType::Custom) {
+	if (!_initialized || special() || _statusType == StatusType::Custom) {
 		return;
 	}
 	_statusType = StatusType::LastSeen;
@@ -417,11 +449,38 @@ void PeerListRow::refreshName(const style::PeerListItem &st) {
 	}
 	const auto text = _isSavedMessagesChat
 		? tr::lng_saved_messages(tr::now)
-		: peer()->name;
+		: generateName();
 	_name.setText(st.nameStyle, text, Ui::NameTextOptions());
 }
 
-PeerListRow::~PeerListRow() = default;
+QString PeerListRow::generateName() {
+	return peer()->name;
+}
+
+QString PeerListRow::generateShortName() {
+	return _isSavedMessagesChat
+		? tr::lng_saved_short(tr::now)
+		: peer()->shortName();
+}
+
+PaintRoundImageCallback PeerListRow::generatePaintUserpicCallback() {
+	return [=](Painter &p, int x, int y, int outerWidth, int size) {
+		paintEntityUserpicLeft(p, x, y, outerWidth, size);
+	};
+}
+
+void PeerListRow::paintEntityUserpicLeft(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) {
+	if (_isSavedMessagesChat) {
+		Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, size);
+	} else {
+		peer()->paintUserpicLeft(p, x, y, outerWidth, size);
+	}
+}
 
 void PeerListRow::invalidatePixmapsCache() {
 	if (_checkbox) {
@@ -430,7 +489,9 @@ void PeerListRow::invalidatePixmapsCache() {
 }
 
 int PeerListRow::nameIconWidth() const {
-	return _peer->isVerified() ? st::dialogsVerifiedIcon.width() : 0;
+	return (special() || !_peer->isVerified())
+		? 0
+		: st::dialogsVerifiedIcon.width();
 }
 
 void PeerListRow::paintNameIcon(
@@ -490,10 +551,8 @@ void PeerListRow::paintUserpic(
 		paintDisabledCheckUserpic(p, st, x, y, outerWidth);
 	} else if (_checkbox) {
 		_checkbox->paint(p, x, y, outerWidth);
-	} else if (_isSavedMessagesChat) {
-		Ui::EmptyUserpic::PaintSavedMessages(p, x, y, outerWidth, st.photoSize);
 	} else {
-		peer()->paintUserpicLeft(p, x, y, outerWidth, st.photoSize);
+		paintEntityUserpicLeft(p, x, y, outerWidth, st.photoSize);
 	}
 }
 
@@ -558,18 +617,19 @@ void PeerListRow::lazyInitialize(const style::PeerListItem &st) {
 	refreshStatus();
 }
 
-void PeerListRow::createCheckbox(Fn<void()> updateCallback) {
+void PeerListRow::createCheckbox(
+		const style::RoundImageCheckbox &st,
+		Fn<void()> updateCallback) {
 	_checkbox = std::make_unique<Ui::RoundImageCheckbox>(
-		st::contactsPhotoCheckbox,
+		st,
 		std::move(updateCallback),
-		PaintUserpicCallback(_peer, _isSavedMessagesChat));
+		generatePaintUserpicCallback());
 }
 
-void PeerListRow::setCheckedInternal(bool checked, SetStyle style) {
+void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
 	Expects(_checkbox != nullptr);
-	using CheckboxStyle = Ui::RoundCheckbox::SetStyle;
+
-	auto speed = (style == SetStyle::Animated) ? CheckboxStyle::Animated : CheckboxStyle::Fast;
+	_checkbox->setChecked(checked, animated);
-	_checkbox->setChecked(checked, speed);
 }
 
 PeerListContent::PeerListContent(
@@ -636,25 +696,30 @@ void PeerListContent::appendFoundRow(not_null<PeerListRow*> row) {
 void PeerListContent::changeCheckState(
 		not_null<PeerListRow*> row,
 		bool checked,
-		PeerListRow::SetStyle style) {
+		anim::type animated) {
 	row->setChecked(
 		checked,
-		style,
+		_st.item.checkbox,
-		[this, row] { updateRow(row); });
+		animated,
+		[=] { updateRow(row); });
 }
 
 void PeerListContent::addRowEntry(not_null<PeerListRow*> row) {
-	if (_controller->respectSavedMessagesChat() && row->peer()->isSelf()) {
+	if (_controller->respectSavedMessagesChat()
+		&& !row->special()
+		&& row->peer()->isSelf()) {
 		row->setIsSavedMessagesChat(true);
 	}
 	_rowsById.emplace(row->id(), row);
-	_rowsByPeer[row->peer()].push_back(row);
+	if (!row->special()) {
+		_rowsByPeer[row->peer()].push_back(row);
+	}
 	if (addingToSearchIndex()) {
 		addToSearchIndex(row);
 	}
-	if (_controller->isRowSelected(row->peer())) {
+	if (_controller->isRowSelected(row)) {
-		Assert(row->id() == row->peer()->id);
+		Assert(row->special() || row->id() == row->peer()->id);
-		changeCheckState(row, true, PeerListRow::SetStyle::Fast);
+		changeCheckState(row, true, anim::type::instant);
 	}
 }
 
@@ -670,7 +735,7 @@ bool PeerListContent::addingToSearchIndex() const {
 }
 
 void PeerListContent::addToSearchIndex(not_null<PeerListRow*> row) {
-	if (row->isSearchResult()) {
+	if (row->isSearchResult() || row->special()) {
 		return;
 	}
 
@@ -763,8 +828,10 @@ void PeerListContent::removeRow(not_null<PeerListRow*> row) {
 	setContexted(Selected());
 
 	_rowsById.erase(row->id());
-	auto &byPeer = _rowsByPeer[row->peer()];
+	if (!row->special()) {
-	byPeer.erase(ranges::remove(byPeer, row), end(byPeer));
+		auto &byPeer = _rowsByPeer[row->peer()];
+		byPeer.erase(ranges::remove(byPeer, row), end(byPeer));
+	}
 	removeFromSearchIndex(row);
 	_filterResults.erase(
 		ranges::remove(_filterResults, row),
@@ -1107,8 +1174,11 @@ void PeerListContent::setPressed(Selected pressed) {
 	_pressed = pressed;
 }
 
-crl::time PeerListContent::paintRow(Painter &p, crl::time ms, RowIndex index) {
+crl::time PeerListContent::paintRow(
-	auto row = getRow(index);
+		Painter &p,
+		crl::time ms,
+		RowIndex index) {
+	const auto row = getRow(index);
 	Assert(row != nullptr);
 
 	row->lazyInitialize(_st.item);
@@ -1119,17 +1189,17 @@ crl::time PeerListContent::paintRow(Painter &p, crl::time ms, RowIndex index) {
 		refreshStatusAt = row->refreshStatusTime();
 	}
 
-	auto peer = row->peer();
+	const auto peer = row->special() ? nullptr : row->peer().get();
-	auto user = peer->asUser();
+	const auto user = peer ? peer->asUser() : nullptr;
-	auto active = (_contexted.index.value >= 0)
+	const auto active = (_contexted.index.value >= 0)
 		? _contexted
 		: (_pressed.index.value >= 0)
 		? _pressed
 		: _selected;
-	auto selected = (active.index == index);
+	const auto selected = (active.index == index);
-	auto actionSelected = (selected && active.action);
+	const auto actionSelected = (selected && active.action);
 
-	auto &bg = selected
+	const auto &bg = selected
 		? _st.item.button.textBgOver
 		: _st.item.button.textBg;
 	p.fillRect(0, 0, width(), _rowHeight, bg);
@@ -1184,12 +1254,17 @@ crl::time PeerListContent::paintRow(Painter &p, crl::time ms, RowIndex index) {
 	}
 
 	p.setFont(st::contactsStatusFont);
-	if (row->isSearchResult() && !_mentionHighlight.isEmpty() && peer->userName().startsWith(_mentionHighlight, Qt::CaseInsensitive)) {
+	if (row->isSearchResult()
-		auto username = peer->userName();
+		&& !_mentionHighlight.isEmpty()
-		auto availableWidth = statusw;
+		&& peer
+		&& peer->userName().startsWith(
+			_mentionHighlight,
+			Qt::CaseInsensitive)) {
+		const auto username = peer->userName();
+		const auto availableWidth = statusw;
 		auto highlightedPart = '@' + username.mid(0, _mentionHighlight.size());
 		auto grayedPart = username.mid(_mentionHighlight.size());
-		auto highlightedWidth = st::contactsStatusFont->width(highlightedPart);
+		const auto highlightedWidth = st::contactsStatusFont->width(highlightedPart);
 		if (highlightedWidth >= availableWidth || grayedPart.isEmpty()) {
 			if (highlightedWidth > availableWidth) {
 				highlightedPart = st::contactsStatusFont->elided(highlightedPart, availableWidth);
@@ -1300,7 +1375,10 @@ void PeerListContent::loadProfilePhotos() {
 			if (to > rowsCount) to = rowsCount;
 
 			for (auto index = from; index != to; ++index) {
-				getRow(RowIndex(index))->peer()->loadUserpic();
+				const auto row = getRow(RowIndex(index));
+				if (!row->special()) {
+					row->peer()->loadUserpic();
+				}
 			}
 		}
 	}
@@ -1313,13 +1391,13 @@ void PeerListContent::checkScrollForPreload() {
 }
 
 void PeerListContent::searchQueryChanged(QString query) {
-	auto searchWordsList = TextUtilities::PrepareSearchWords(query);
+	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
-	auto normalizedQuery = searchWordsList.join(' ');
+	const auto normalizedQuery = searchWordsList.join(' ');
 	if (_normalizedSearchQuery != normalizedQuery) {
 		setSearchQuery(query, normalizedQuery);
 		if (_controller->searchInLocal() && !searchWordsList.isEmpty()) {
 			auto minimalList = (const std::vector<not_null<PeerListRow*>>*)nullptr;
-			for_const (auto &searchWord, searchWordsList) {
+			for (const auto &searchWord : searchWordsList) {
 				auto searchWordStart = searchWord[0].toLower();
 				auto it = _searchIndex.find(searchWordStart);
 				if (it == _searchIndex.cend()) {
@@ -1343,7 +1421,7 @@ void PeerListContent::searchQueryChanged(QString query) {
 				};
 				auto allSearchWordsInNames = [&](
 						not_null<PeerData*> peer) {
-					for_const (auto &searchWord, searchWordsList) {
+					for (const auto &searchWord : searchWordsList) {
 						if (!searchWordInNames(peer, searchWord)) {
 							return false;
 						}
@@ -1352,8 +1430,8 @@ void PeerListContent::searchQueryChanged(QString query) {
 				};
 
 				_filterResults.reserve(minimalList->size());
-				for_const (auto row, *minimalList) {
+				for (const auto row : *minimalList) {
-					if (allSearchWordsInNames(row->peer())) {
+					if (!row->special() && allSearchWordsInNames(row->peer())) {
 						_filterResults.push_back(row);
 					}
 				}

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -38,22 +38,31 @@ namespace Notify {
 struct PeerUpdate;
 } // namespace Notify
 
-auto PaintUserpicCallback(
+using PaintRoundImageCallback = Fn<void(
+	Painter &p,
+	int x,
+	int y,
+	int outerWidth,
+	int size)>;
+
+[[nodiscard]] PaintRoundImageCallback PaintUserpicCallback(
 	not_null<PeerData*> peer,
-	bool respectSavedMessagesChat)
+	bool respectSavedMessagesChat);
--> Fn<void(Painter &p, int x, int y, int outerWidth, int size)>;
 
 using PeerListRowId = uint64;
 class PeerListRow {
 public:
-	PeerListRow(not_null<PeerData*> peer);
-	PeerListRow(not_null<PeerData*> peer, PeerListRowId id);
-
 	enum class State {
 		Active,
 		Disabled,
 		DisabledChecked,
 	};
+
+	explicit PeerListRow(not_null<PeerData*> peer);
+	PeerListRow(not_null<PeerData*> peer, PeerListRowId id);
+
+	virtual ~PeerListRow();
+
 	void setDisabledState(State state) {
 		_disabledState = state;
 	}
@@ -62,20 +71,27 @@ public:
 	// not by the row itself, so there is no setChecked() method.
 	// We can query the checked state from row, but before it is
 	// added to the box it is always false.
-	bool checked() const;
+	[[nodiscard]] bool checked() const;
+
+	[[nodiscard]] bool special() const {
+		return !_peer;
+	}
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		Expects(!special());
 
-	not_null<PeerData*> peer() const {
 		return _peer;
 	}
-	PeerListRowId id() const {
+	[[nodiscard]] PeerListRowId id() const {
 		return _id;
 	}
 
+	[[nodiscard]] virtual QString generateName();
+	[[nodiscard]] virtual QString generateShortName();
+	[[nodiscard]] PaintRoundImageCallback generatePaintUserpicCallback();
+
 	void setCustomStatus(const QString &status);
 	void clearCustomStatus();
 
-	virtual ~PeerListRow();
-
 	// Box interface.
 	virtual int nameIconWidth() const;
 	virtual void paintNameIcon(
@@ -138,19 +154,16 @@ public:
 		_isSavedMessagesChat = isSavedMessagesChat;
 	}
 
-	enum class SetStyle {
-		Animated,
-		Fast,
-	};
 	template <typename UpdateCallback>
 	void setChecked(
 			bool checked,
-			SetStyle style,
+		const style::RoundImageCheckbox &st,
+			anim::type animated,
 			UpdateCallback callback) {
 		if (checked && !_checkbox) {
-			createCheckbox(std::move(callback));
+			createCheckbox(st, std::move(callback));
 		}
-		setCheckedInternal(checked, style);
+		setCheckedInternal(checked, animated);
 	}
 	void invalidatePixmapsCache();
 
@@ -192,9 +205,20 @@ protected:
 		return _initialized;
 	}
 
+	explicit PeerListRow(PeerListRowId id);
+
+	virtual void paintEntityUserpicLeft(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size);
+
 private:
-	void createCheckbox(Fn<void()> updateCallback);
+	void createCheckbox(
-	void setCheckedInternal(bool checked, SetStyle style);
+		const style::RoundImageCheckbox &st,
+		Fn<void()> updateCallback);
+	void setCheckedInternal(bool checked, anim::type animated);
 	void paintDisabledCheckUserpic(
 		Painter &p,
 		const style::PeerListItem &st,
@@ -204,7 +228,7 @@ private:
 	void setStatusText(const QString &text);
 
 	PeerListRowId _id = 0;
-	not_null<PeerData*> _peer;
+	PeerData *_peer = nullptr;
 	std::unique_ptr<Ui::RippleAnimation> _ripple;
 	std::unique_ptr<Ui::RoundImageCheckbox> _checkbox;
 	Ui::Text::String _name;
@@ -245,7 +269,7 @@ public:
 	virtual void peerListUpdateRow(not_null<PeerListRow*> row) = 0;
 	virtual void peerListRemoveRow(not_null<PeerListRow*> row) = 0;
 	virtual void peerListConvertRowToSearchResult(not_null<PeerListRow*> row) = 0;
-	virtual bool peerListIsRowSelected(not_null<PeerData*> peer) = 0;
+	virtual bool peerListIsRowChecked(not_null<PeerListRow*> row) = 0;
 	virtual void peerListSetRowChecked(not_null<PeerListRow*> row, bool checked) = 0;
 	virtual not_null<PeerListRow*> peerListRowAt(int index) = 0;
 	virtual void peerListRefreshRows() = 0;
@@ -256,9 +280,17 @@ public:
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 
 	template <typename PeerDataRange>
-	void peerListAddSelectedRows(PeerDataRange &&range) {
+	void peerListAddSelectedPeers(PeerDataRange &&range) {
-		for (auto peer : range) {
+		for (const auto peer : range) {
-			peerListAddSelectedRowInBunch(peer);
+			peerListAddSelectedPeerInBunch(peer);
+		}
+		peerListFinishSelectedRowsBunch();
+	}
+
+	template <typename PeerListRowRange>
+	void peerListAddSelectedRows(PeerListRowRange &&range) {
+		for (const auto row : range) {
+			peerListAddSelectedRowInBunch(row);
 		}
 		peerListFinishSelectedRowsBunch();
 	}
@@ -271,7 +303,8 @@ public:
 	virtual ~PeerListDelegate() = default;
 
 private:
-	virtual void peerListAddSelectedRowInBunch(not_null<PeerData*> peer) = 0;
+	virtual void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) = 0;
+	virtual void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) = 0;
 	virtual void peerListFinishSelectedRowsBunch() = 0;
 
 };
@@ -366,8 +399,8 @@ public:
 
 	virtual int contentWidth() const;
 
-	bool isRowSelected(not_null<PeerData*> peer) {
+	bool isRowSelected(not_null<PeerListRow*> row) {
-		return delegate()->peerListIsRowSelected(peer);
+		return delegate()->peerListIsRowChecked(row);
 	}
 
 	virtual bool searchInLocal() {
@@ -470,7 +503,10 @@ public:
 	void refreshRows();
 
 	void setSearchMode(PeerListSearchMode mode);
-	void changeCheckState(not_null<PeerListRow*> row, bool checked, PeerListRow::SetStyle style);
+	void changeCheckState(
+		not_null<PeerListRow*> row,
+		bool checked,
+		anim::type animated);
 
 	template <typename ReorderCallback>
 	void reorderRows(ReorderCallback &&callback) {
@@ -677,10 +713,7 @@ public:
 	void peerListSetRowChecked(
 			not_null<PeerListRow*> row,
 			bool checked) override {
-		_content->changeCheckState(
+		_content->changeCheckState(row, checked, anim::type::normal);
-			row,
-			checked,
-			PeerListRow::SetStyle::Animated);
 	}
 	int peerListFullRowsCount() override {
 		return _content->fullRowsCount();
@@ -770,7 +803,7 @@ public:
 	void peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) override;
-	bool peerListIsRowSelected(not_null<PeerData*> peer) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
 	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
@@ -784,15 +817,26 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
-	void peerListAddSelectedRowInBunch(
+	void peerListAddSelectedPeerInBunch(
 			not_null<PeerData*> peer) override {
-		addSelectItem(peer, PeerListRow::SetStyle::Fast);
+		addSelectItem(peer, anim::type::instant);
+	}
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override {
+		addSelectItem(row, anim::type::instant);
 	}
 	void peerListFinishSelectedRowsBunch() override;
 
 	void addSelectItem(
 		not_null<PeerData*> peer,
-		PeerListRow::SetStyle style);
+		anim::type animated);
+	void addSelectItem(
+		not_null<PeerListRow*> row,
+		anim::type animated);
+	void addSelectItem(
+		uint64 itemId,
+		const QString &text,
+		PaintRoundImageCallback paintUserpic,
+		anim::type animated);
 	void createMultiSelect();
 	int getTopScrollSkip() const;
 	void updateScrollSkips();

Telegram/SourceFiles/data/data_types.h

@@ -135,10 +135,11 @@ constexpr auto NoChannel = ChannelId(0);
 using PeerId = uint64;
 
 constexpr auto PeerIdMask         = PeerId(0xFFFFFFFFULL);
-constexpr auto PeerIdTypeMask     = PeerId(0x300000000ULL);
+constexpr auto PeerIdTypeMask     = PeerId(0xF00000000ULL);
 constexpr auto PeerIdUserShift    = PeerId(0x000000000ULL);
 constexpr auto PeerIdChatShift    = PeerId(0x100000000ULL);
 constexpr auto PeerIdChannelShift = PeerId(0x200000000ULL);
+constexpr auto PeerIdFakeShift    = PeerId(0xF00000000ULL);
 
 inline constexpr bool peerIsUser(const PeerId &id) {
 	return (id & PeerIdTypeMask) == PeerIdUserShift;

Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp

@@ -251,7 +251,7 @@ void InnerWidget::peerListSetTitle(rpl::producer<QString> title) {
 void InnerWidget::peerListSetAdditionalTitle(rpl::producer<QString> title) {
 }
 
-bool InnerWidget::peerListIsRowSelected(not_null<PeerData*> peer) {
+bool InnerWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
 	return false;
 }
 
@@ -267,7 +267,11 @@ void InnerWidget::peerListScrollToTop() {
 	_scrollToRequests.fire({ -1, -1 });
 }
 
-void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerData*> peer) {
+void InnerWidget::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
 	Unexpected("Item selection in Info::Profile::Members.");
 }
 

Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h

@@ -50,12 +50,14 @@ private:
 	// PeerListContentDelegate interface.
 	void peerListSetTitle(rpl::producer<QString> title) override;
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
-	bool peerListIsRowSelected(not_null<PeerData*> peer) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
 	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
-	void peerListAddSelectedRowInBunch(
+	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
 	void peerListFinishSelectedRowsBunch() override;
 	void peerListSetDescription(
 		object_ptr<Ui::FlatLabel> description) override;

Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp

@@ -56,12 +56,14 @@ class ListDelegate final : public PeerListContentDelegate {
 public:
 	void peerListSetTitle(rpl::producer<QString> title) override;
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
-	bool peerListIsRowSelected(not_null<PeerData*> peer) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
 	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
-	void peerListAddSelectedRowInBunch(
+	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
 	void peerListFinishSelectedRowsBunch() override;
 	void peerListSetDescription(
 		object_ptr<Ui::FlatLabel> description) override;
@@ -121,7 +123,7 @@ void ListDelegate::peerListSetTitle(rpl::producer<QString> title) {
 void ListDelegate::peerListSetAdditionalTitle(rpl::producer<QString> title) {
 }
 
-bool ListDelegate::peerListIsRowSelected(not_null<PeerData*> peer) {
+bool ListDelegate::peerListIsRowChecked(not_null<PeerListRow*> row) {
 	return false;
 }
 
@@ -137,7 +139,11 @@ auto ListDelegate::peerListCollectSelectedRows()
 void ListDelegate::peerListScrollToTop() {
 }
 
-void ListDelegate::peerListAddSelectedRowInBunch(not_null<PeerData*> peer) {
+void ListDelegate::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void ListDelegate::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
 	Unexpected("Item selection in Info::Profile::Members.");
 }
 

Telegram/SourceFiles/info/profile/info_profile_members.cpp

@@ -415,7 +415,7 @@ void Members::peerListSetTitle(rpl::producer<QString> title) {
 void Members::peerListSetAdditionalTitle(rpl::producer<QString> title) {
 }
 
-bool Members::peerListIsRowSelected(not_null<PeerData*> peer) {
+bool Members::peerListIsRowChecked(not_null<PeerListRow*> row) {
 	return false;
 }
 
@@ -431,7 +431,11 @@ void Members::peerListScrollToTop() {
 	_scrollToRequests.fire({ -1, -1 });
 }
 
-void Members::peerListAddSelectedRowInBunch(not_null<PeerData*> peer) {
+void Members::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void Members::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
 	Unexpected("Item selection in Info::Profile::Members.");
 }
 

Telegram/SourceFiles/info/profile/info_profile_members.h

@@ -61,12 +61,14 @@ private:
 	// PeerListContentDelegate interface.
 	void peerListSetTitle(rpl::producer<QString> title) override;
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
-	bool peerListIsRowSelected(not_null<PeerData*> peer) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
 	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
-	void peerListAddSelectedRowInBunch(
+	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
 	void peerListFinishSelectedRowsBunch() override;
 	void peerListSetDescription(
 		object_ptr<Ui::FlatLabel> description) override;

Telegram/SourceFiles/ui/effects/round_checkbox.cpp

@@ -323,15 +323,15 @@ void RoundCheckbox::paint(Painter &p, int x, int y, int outerWidth, float64 mast
 	}
 }
 
-void RoundCheckbox::setChecked(bool newChecked, SetStyle speed) {
+void RoundCheckbox::setChecked(bool newChecked, anim::type animated) {
 	if (_checked == newChecked) {
-		if (speed != SetStyle::Animated) {
+		if (animated == anim::type::instant) {
 			_checkedProgress.stop();
 		}
 		return;
 	}
 	_checked = newChecked;
-	if (speed == SetStyle::Animated) {
+	if (animated == anim::type::normal) {
 		_checkedProgress.start(
 			_updateCallback,
 			_checked ? 0. : 1.,
@@ -441,16 +441,16 @@ float64 RoundImageCheckbox::checkedAnimationRatio() const {
 	return snap(_selection.value(checked() ? 1. : 0.), 0., 1.);
 }
 
-void RoundImageCheckbox::setChecked(bool newChecked, SetStyle speed) {
+void RoundImageCheckbox::setChecked(bool newChecked, anim::type animated) {
 	auto changed = (checked() != newChecked);
-	_check.setChecked(newChecked, speed);
+	_check.setChecked(newChecked, animated);
 	if (!changed) {
-		if (speed != SetStyle::Animated) {
+		if (animated == anim::type::instant) {
 			_selection.stop();
 		}
 		return;
 	}
-	if (speed == SetStyle::Animated) {
+	if (animated == anim::type::normal) {
 		prepareWideCache();
 		_selection.start(_updateCallback, checked() ? 0 : 1, checked() ? 1 : 0, _st.selectDuration, anim::bumpy(1.25));
 	} else {

Telegram/SourceFiles/ui/effects/round_checkbox.h

@@ -22,11 +22,9 @@ public:
 	bool checked() const {
 		return _checked;
 	}
-	enum class SetStyle {
+	void setChecked(
-		Animated,
+		bool newChecked,
-		Fast,
+		anim::type animated = anim::type::normal);
-	};
-	void setChecked(bool newChecked, SetStyle speed = SetStyle::Animated);
 
 	void invalidateCache();
 
@@ -55,8 +53,9 @@ public:
 	bool checked() const {
 		return _check.checked();
 	}
-	using SetStyle = RoundCheckbox::SetStyle;
+	void setChecked(
-	void setChecked(bool newChecked, SetStyle speed = SetStyle::Animated);
+		bool newChecked,
+		anim::type animated = anim::type::normal);
 
 	void invalidateCache() {
 		_check.invalidateCache();

Telegram/SourceFiles/window/window.style

@@ -304,6 +304,13 @@ windowFilterSmallItem: PeerListItem(defaultPeerListItem) {
 	photoPosition: point(15px, 5px);
 	namePosition: point(62px, 14px);
 	photoSize: 34px;
+	checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+		imageRadius: 17px;
+		imageSmallRadius: 14px;
+	}
+}
+windowFilterSmallList: PeerList(defaultPeerList) {
+	item: windowFilterSmallItem;
 }
 windowFilterSmallRemove: IconButton(notifyClose) {
 }
@@ -316,6 +323,13 @@ windowFilterTypeBots: icon {{ "filters_type_bots", historyPeerUserpicFg }};
 windowFilterTypeNoMuted: icon {{ "filters_type_muted", historyPeerUserpicFg }};
 windowFilterTypeNoArchived: icon {{ "filters_type_archived", historyPeerUserpicFg }};
 windowFilterTypeNoRead: icon {{ "filters_type_read", historyPeerUserpicFg }};
+windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: searchedBarFont;
+	}
+	textFg: searchedBarFg;
+}
+windowFilterChatsSectionSubtitlePadding: margins(17px, 7px, 17px, 7px);
 
 // Mac specific
 

Telegram/lib_ui

@@ -1 +1 @@
-Subproject commit c96119dcd18bff5974348524b1e15b3d396426dc
+Subproject commit d2611d7e8588759c9ecc129ce70ef0d7b2e24d6c