[img-editor] Added photo button row to stickers list widget.

Author: 23rd

Telegram/Resources/icons/photo_editor/camera.svg

@@ -153,6 +153,7 @@ EmojiPan {
 	searchBackIconTop: pixels;
 	searchBackTextLeft: pixels;
 	searchBackTextTop: pixels;
+	photoButtonIcon: icon;
 	colorAll: IconButton;
 	colorAllLabel: FlatLabel;
 	removeSet: IconButton;
@@ -629,6 +630,12 @@ stickerIconMove: 400;
 stickerPreviewDuration: 150;
 stickerPreviewMin: 0.1;
 stickerPanFirstAfterShortcutsSkip: 4px;
+stickersPhotoRowPadding: margins(0px, 12px, 0px, 12px);
+stickersPhotoButtonHeight: 36px;
+stickersPhotoButtonRadius: 8px;
+stickersPhotoButtonPadding: margins(6px, 0px, 12px, 0px);
+stickersPhotoButtonIconSkip: 4px;
+stickersPhotoButtonFont: font(21px bold);
 mediaPreviewPhotoSkip: 48px;
 
 emojiPanColorAll: IconButton(stickerPanRemoveSet) {
@@ -822,6 +829,7 @@ defaultEmojiPan: EmojiPan {
 	searchBackIconTop: 6px;
 	searchBackTextLeft: 40px;
 	searchBackTextTop: 10px;
+	photoButtonIcon: icon {{ "photo_editor/camera-24x24", windowFg }};
 	colorAll: emojiPanColorAll;
 	colorAllLabel: emojiPanColorAllLabel;
 	removeSet: stickerPanRemoveSet;

Telegram/SourceFiles/chat_helpers/chat_helpers.style

@@ -22,6 +22,7 @@ struct ComposeFeatures {
 	bool collectibleStatus : 1 = false;
 	bool stickersSettings : 1 = true;
 	bool openStickerSets : 1 = true;
+	bool photoButton : 1 = false;
 	bool autocompleteHashtags : 1 = true;
 	bool autocompleteMentions : 1 = true;
 	bool autocompleteCommands : 1 = true;

Telegram/SourceFiles/chat_helpers/compose/compose_features.h

@@ -240,6 +240,9 @@ StickersListWidget::StickersListWidget(
 , _megagroupSetAbout(st::columnMinimalWidthThird
 	- st::emojiScroll.width
 	- st().headerLeft)
+, _photoButtonBg(st::stickersPhotoButtonRadius, st().overBg)
+, _photoButtonText(tr::lng_attach_photo(tr::now).toUpper())
+, _photoButtonTextWidth(st::stickersPhotoButtonFont->width(_photoButtonText))
 , _addText(tr::lng_stickers_featured_add(tr::now))
 , _addWidth(st::stickersTrendingAdd.style.font->width(_addText))
 , _installedText(tr::lng_stickers_featured_installed(tr::now))
@@ -317,6 +320,10 @@ rpl::producer<FileChosen> StickersListWidget::chosen() const {
 	return _chosen.events();
 }
 
+rpl::producer<> StickersListWidget::photoRequests() const {
+	return _photoRequests.events();
+}
+
 rpl::producer<> StickersListWidget::scrollUpdated() const {
 	return _scrollUpdated.events();
 }
@@ -502,7 +509,7 @@ template <typename Callback>
 bool StickersListWidget::enumerateSections(Callback callback) const {
 	auto info = SectionInfo();
 	info.top = _search ? _search->height() : 0;
-	info.top += searchShortcutsHeight();
+	info.top += photoRowHeight() + searchShortcutsHeight();
 	const auto &sets = shownSets();
 	for (auto i = 0; i != sets.size(); ++i) {
 		auto &set = sets[i];
@@ -969,7 +976,69 @@ void StickersListWidget::startSearchSwapAnimation(
 }
 
 int StickersListWidget::searchShortcutsTop() const {
-	return _search ? _search->height() : 0;
+	return (_search ? _search->height() : 0) + photoRowHeight();
+}
+
+int StickersListWidget::photoRowHeight() const {
+	if (!_features.photoButton || _isMasks || _section == Section::Search) {
+		return 0;
+	}
+	const auto &padding = st::stickersPhotoRowPadding;
+	return padding.top() + st::stickersPhotoButtonHeight + padding.bottom();
+}
+
+QRect StickersListWidget::photoButtonRect() const {
+	const auto &padding = st::stickersPhotoButtonPadding;
+	const auto &icon = st().photoButtonIcon;
+	const auto buttonWidth = padding.left()
+		+ icon.width()
+		+ st::stickersPhotoButtonIconSkip
+		+ _photoButtonTextWidth
+		+ padding.right();
+	const auto top = (_search ? _search->height() : 0)
+		+ st::stickersPhotoRowPadding.top();
+	return QRect(
+		(width() - buttonWidth) / 2,
+		top,
+		buttonWidth,
+		st::stickersPhotoButtonHeight);
+}
+
+void StickersListWidget::paintPhotoButton(Painter &p, QRect clip) {
+	if (!photoRowHeight()) {
+		return;
+	}
+	const auto rect = photoButtonRect();
+	if (!rect.intersects(clip)) {
+		return;
+	}
+	_photoButtonBg.paint(p, myrtlrect(rect));
+	if (_photoButtonRipple) {
+		_photoButtonRipple->paint(p, myrtlrect(rect).x(), rect.y(), width());
+		if (_photoButtonRipple->empty()) {
+			_photoButtonRipple.reset();
+		}
+	}
+	const auto &padding = st::stickersPhotoButtonPadding;
+	const auto &icon = st().photoButtonIcon;
+	icon.paint(
+		p,
+		rect.x() + padding.left(),
+		rect.y() + (rect.height() - icon.height()) / 2,
+		width());
+	const auto &font = st::stickersPhotoButtonFont;
+	const auto textLeft = rect.x()
+		+ padding.left()
+		+ icon.width()
+		+ st::stickersPhotoButtonIconSkip;
+	p.setFont(font);
+	p.setPen(st().textFg);
+	p.drawTextLeft(
+		textLeft,
+		rect.y() + (rect.height() - font->height) / 2,
+		width(),
+		_photoButtonText,
+		_photoButtonTextWidth);
 }
 
 int StickersListWidget::searchShortcutsHeight() const {
@@ -1555,6 +1624,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 	_paintAsPremium = session().premium();
 	_pathGradient->startFrame(0, width(), width() / 2);
 	paintSearchShortcuts(p, clip);
+	paintPhotoButton(p, clip);
 
 	auto &sets = shownSets();
 	const auto selectedSticker = std::get_if<OverSticker>(&_selected);
@@ -2412,6 +2482,10 @@ void StickersListWidget::setPressed(OverState newPressed) {
 		if (_megagroupSetButtonRipple) {
 			_megagroupSetButtonRipple->lastStop();
 		}
+	} else if (std::get_if<OverPhotoButton>(&_pressed)) {
+		if (_photoButtonRipple) {
+			_photoButtonRipple->lastStop();
+		}
 	}
 	_pressed = newPressed;
 	if (auto button = std::get_if<OverButton>(&_pressed)) {
@@ -2445,6 +2519,18 @@ void StickersListWidget::setPressed(OverState newPressed) {
 		}
 		_megagroupSetButtonRipple->add(mapFromGlobal(QCursor::pos())
 			- myrtlrect(megagroupSetButtonRectFinal()).topLeft());
+	} else if (std::get_if<OverPhotoButton>(&_pressed)) {
+		if (!_photoButtonRipple) {
+			auto mask = Ui::RippleAnimation::RoundRectMask(
+				photoButtonRect().size(),
+				st::stickersPhotoButtonRadius);
+			_photoButtonRipple = std::make_unique<Ui::RippleAnimation>(
+				st().searchPackRipple,
+				std::move(mask),
+				[this] { rtlupdate(photoButtonRect()); });
+		}
+		_photoButtonRipple->add(mapFromGlobal(QCursor::pos())
+			- myrtlrect(photoButtonRect()).topLeft());
 	}
 }
 
@@ -2779,6 +2865,9 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		if (std::get_if<OverSearchBack>(&pressed)) {
 			backToSearchResults();
 			return;
+		} else if (std::get_if<OverPhotoButton>(&pressed)) {
+			_photoRequests.fire({});
+			return;
 		} else if (auto shortcut = std::get_if<OverSearchShortcut>(&pressed)) {
 			toggleSearchShortcut(shortcut->index);
 			return;
@@ -3556,6 +3645,9 @@ void StickersListWidget::updateSelected() {
 		}
 		setSelected(newSelected);
 		return;
+	} else if (photoRowHeight() && myrtlrect(photoButtonRect()).contains(p)) {
+		setSelected(OverPhotoButton{});
+		return;
 	}
 	const auto &sets = shownSets();
 	auto sx = (rtl() ? width() - p.x() : p.x()) - stickersLeft();
@@ -3667,6 +3759,8 @@ void StickersListWidget::setSelected(OverState newSelected) {
 				rtlupdate(searchBackRect());
 			} else if (std::get_if<OverGroupAdd>(&_selected)) {
 				rtlupdate(megagroupSetButtonRectFinal());
+			} else if (std::get_if<OverPhotoButton>(&_selected)) {
+				rtlupdate(photoButtonRect());
 			}
 		};
 		updateSelected();

Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp

@@ -104,6 +104,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 		StickersListDescriptor &&descriptor);
 
 	rpl::producer<FileChosen> chosen() const;
+	[[nodiscard]] rpl::producer<> photoRequests() const;
 	rpl::producer<> scrollUpdated() const;
 	rpl::producer<TabbedSelector::Action> choosingUpdated() const;
 
@@ -232,14 +233,23 @@ class StickersListWidget final : public TabbedSelector::Inner {
 			return !(*this == other);
 		}
 	};
+	struct OverPhotoButton {
+		inline bool operator==(OverPhotoButton other) const {
+			return true;
+		}
+		inline bool operator!=(OverPhotoButton other) const {
+			return !(*this == other);
+		}
+	};
 	using OverState = std::variant<
 		v::null_t,
 		OverSticker,
 		OverSet,
 		OverButton,
 		OverSearchShortcut,
 		OverSearchBack,
-		OverGroupAdd>;
+		OverGroupAdd,
+		OverPhotoButton>;
 
 	struct SectionInfo {
 		int section = 0;
@@ -310,6 +320,9 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	void readVisibleFeatured(int visibleTop, int visibleBottom);
 
 	void paintStickers(Painter &p, QRect clip);
+	void paintPhotoButton(Painter &p, QRect clip);
+	[[nodiscard]] int photoRowHeight() const;
+	[[nodiscard]] QRect photoButtonRect() const;
 	void paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected);
 	void paintSticker(
 		Painter &p,
@@ -494,6 +507,11 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	QRect _megagroupSetButtonRect;
 	std::unique_ptr<Ui::RippleAnimation> _megagroupSetButtonRipple;
 
+	Ui::RoundRect _photoButtonBg;
+	QString _photoButtonText;
+	int _photoButtonTextWidth = 0;
+	std::unique_ptr<Ui::RippleAnimation> _photoButtonRipple;
+
 	QString _addText;
 	int _addWidth;
 	QString _installedText;
@@ -532,6 +550,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	bool _searchLoading = false;
 
 	rpl::event_stream<FileChosen> _chosen;
+	rpl::event_stream<> _photoRequests;
 	rpl::event_stream<> _scrollUpdated;
 	rpl::event_stream<TabbedSelector::Action> _choosingUpdated;
 

Telegram/SourceFiles/chat_helpers/stickers_list_widget.h

@@ -746,6 +746,10 @@ auto TabbedSelector::inlineResultChosen() const
 	return hasGifsTab() ? gifs()->inlineResultChosen() : nullptr;
 }
 
+rpl::producer<> TabbedSelector::photoRequests() const {
+	return hasStickersTab() ? stickers()->photoRequests() : rpl::never<>();
+}
+
 auto TabbedSelector::choosingStickerUpdated() const
 -> rpl::producer<TabbedSelector::Action>{
 	return hasStickersTab()

Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp

@@ -148,6 +148,7 @@ class TabbedSelector : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<FileChosen> fileChosen() const;
 	[[nodiscard]] rpl::producer<PhotoChosen> photoChosen() const;
 	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
+	[[nodiscard]] rpl::producer<> photoRequests() const;
 
 	[[nodiscard]] rpl::producer<> cancelled() const;
 	[[nodiscard]] rpl::producer<> checkForHide() const;

Telegram/SourceFiles/chat_helpers/tabbed_selector.h

@@ -661,6 +661,10 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	categoriesBgOver: storiesComposeBgOver;
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
 	fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
+	photoButtonIcon: icon {{
+		"photo_editor/camera-24x24",
+		storiesComposeWhiteText
+	}};
 	menu: storiesPopupMenuWithIcons;
 	menuAttention: storiesMenuWithIconsAttention;
 	expandedSeparator: mediaviewWideMenuSeparator;