From 60a96bf9d62d75fcf789ff6ab4b3d4f239197677 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Wed, 17 Apr 2024 02:38:43 +0300 Subject: [PATCH] fix: make it build --- .../SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp | 2 +- Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp | 2 +- Telegram/SourceFiles/chat_helpers/emoji_list_widget.h | 5 ----- Telegram/SourceFiles/window/window_main_menu_helpers.cpp | 2 +- Telegram/lib_ui | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp index 70c8f9554..0a95c7338 100644 --- a/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp +++ b/Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp @@ -381,7 +381,7 @@ auto GenerateParticipantString( data, }); } - const auto username = peer->userName(); + const auto username = peer->username(); if (username.isEmpty()) { return name; } diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index ac8b6f117..fa69a38e7 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -2557,7 +2557,7 @@ void EmojiListWidget::setSelected(OverState newSelected) { const auto hasSelection = !v::is_null(_selected); if (hasSelection && Core::App().settings().suggestEmoji()) { - Ui::Tooltip::Show(1000, this); + Ui::Tooltip::Show(350, this); } setCursor(hasSelection ? style::cur_pointer : style::cur_default); diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h index 9f35f1963..d3fba5c72 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h @@ -377,8 +377,6 @@ private: void applyNextSearchQuery(); - void showPreview(); - const std::shared_ptr _show; const ComposeFeatures _features; Mode _mode = Mode::Full; @@ -453,9 +451,6 @@ private: rpl::event_stream _customChosen; rpl::event_stream<> _jumpedToPremium; - base::Timer _previewTimer; - bool _previewShown = false; - }; tr::phrase<> EmojiCategoryTitle(int index); diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp index 88c0af421..c10a3e41a 100644 --- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp +++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp @@ -48,7 +48,7 @@ public: bool active) override { update(); if (active && action && !action->dragText().isEmpty()) { - Ui::Tooltip::Show(1000, this); + Ui::Tooltip::Show(350, this); } else { Ui::Tooltip::Hide(); } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index b89317234..7a859501c 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit b893172343871ba854220c0ff670df4ae991bb97 +Subproject commit 7a859501c14bb041ef8579d0b0724e912221421f