void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applied search categories to emoji userpic builder.

Browse source
This commit is contained in:
23rd 2023-01-30 15:20:25 +03:00 • committed by John Preston
parent fda49a3bfa
commit 70cda17dea
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
View file

@ -471,7 +471,7 @@ void EmojiListWidget::setupSearch() {
InvokeQueued(this, [=] { InvokeQueued(this, [=] {
applyNextSearchQuery(); applyNextSearchQuery();
}); });
}, session, (_mode == Mode::EmojiStatus)); }, session, (_mode == Mode::EmojiStatus), _mode == Mode::UserpicBuilder);
} }
void EmojiListWidget::applyNextSearchQuery() { void EmojiListWidget::applyNextSearchQuery() {
@ -720,7 +720,8 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
void EmojiListWidget::afterShown() { void EmojiListWidget::afterShown() {
const auto steal = (_mode == Mode::EmojiStatus) const auto steal = (_mode == Mode::EmojiStatus)
|| (_mode == Mode::FullReactions); || (_mode == Mode::FullReactions)
|| (_mode == Mode::UserpicBuilder);
if (_search && steal) { if (_search && steal) {
_search->stealFocus(); _search->stealFocus();
} }
@ -1411,6 +1412,7 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
_jumpedToPremium.fire({}); _jumpedToPremium.fire({});
switch (_mode) { switch (_mode) {
case Mode::Full: case Mode::Full:
case Mode::UserpicBuilder:
Settings::ShowPremium(_controller, u"animated_emoji"_q); Settings::ShowPremium(_controller, u"animated_emoji"_q);
break; break;
case Mode::FullReactions: case Mode::FullReactions:

1
Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
View file

@ -68,6 +68,7 @@ enum class EmojiListMode {
EmojiStatus, EmojiStatus,
FullReactions, FullReactions,
RecentReactions, RecentReactions,
UserpicBuilder,
}; };
struct EmojiListDescriptor { struct EmojiListDescriptor {

7
Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
View file

@ -295,12 +295,15 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
const style::EmojiPan &st, const style::EmojiPan &st,
Fn<void(std::vector<QString>&&)> callback, Fn<void(std::vector<QString>&&)> callback,
not_null<Main::Session*> session, not_null<Main::Session*> session,
bool statusCategories) { bool statusCategories,
bool profilePhotoCategories) {
using Descriptor = Ui::SearchDescriptor; using Descriptor = Ui::SearchDescriptor;
const auto owner = &session->data(); const auto owner = &session->data();
auto result = std::make_unique<Ui::TabbedSearch>(parent, st, Descriptor{ auto result = std::make_unique<Ui::TabbedSearch>(parent, st, Descriptor{
.st = st.search, .st = st.search,
.groups = (statusCategories .groups = (profilePhotoCategories
? owner->emojiStatuses().profilePhotoGroupsValue()
: statusCategories
? owner->emojiStatuses().statusGroupsValue() ? owner->emojiStatuses().statusGroupsValue()
: owner->emojiStatuses().emojiGroupsValue()), : owner->emojiStatuses().emojiGroupsValue()),
.customEmojiFactory = owner->customEmojiManager().factory( .customEmojiFactory = owner->customEmojiManager().factory(

3
Telegram/SourceFiles/chat_helpers/tabbed_selector.h
View file

@ -83,7 +83,8 @@ using InlineChosen = InlineBots::ResultSelected;
const style::EmojiPan &st, const style::EmojiPan &st,
Fn<void(std::vector<QString>&&)> callback, Fn<void(std::vector<QString>&&)> callback,
not_null<Main::Session*> session, not_null<Main::Session*> session,
bool statusCategories = false); bool statusCategories = false,
bool profilePhotoCategories = false);
class TabbedSelector : public Ui::RpWidget { class TabbedSelector : public Ui::RpWidget {
public: public:

2
Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
View file

@ -186,7 +186,7 @@ EmojiSelector::Selector EmojiSelector::createEmojiList(
const auto tag = Data::CustomEmojiManager::SizeTag::Large; const auto tag = Data::CustomEmojiManager::SizeTag::Large;
auto args = ChatHelpers::EmojiListDescriptor{ auto args = ChatHelpers::EmojiListDescriptor{
.session = session, .session = session,
.mode = ChatHelpers::EmojiListMode::FullReactions, .mode = ChatHelpers::EmojiListMode::UserpicBuilder,
.controller = _controller, .controller = _controller,
.paused = [=] { return true; }, .paused = [=] { return true; },
.customRecentList = session->api().peerPhoto().profileEmojiList(), .customRecentList = session->api().peerPhoto().profileEmojiList(),