From fd2edb51e9be57d6559a99f51a8fdd7cecdefca8 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 20 Oct 2022 18:57:15 +0300 Subject: [PATCH] Fixed build in Xcode. --- Telegram/SourceFiles/dialogs/dialogs_entry.h | 2 +- .../SourceFiles/dialogs/dialogs_main_list.h | 18 ++++++++++-------- .../touchbar/items/mac_pinned_chats_item.mm | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.h b/Telegram/SourceFiles/dialogs/dialogs_entry.h index 8c9a85530..780f1dfff 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_entry.h +++ b/Telegram/SourceFiles/dialogs/dialogs_entry.h @@ -242,7 +242,7 @@ public: protected: void notifyUnreadStateChange(const UnreadState &wasState); - auto unreadStateChangeNotifier(bool required); + inline auto unreadStateChangeNotifier(bool required); [[nodiscard]] int lookupPinnedIndex(FilterId filterId) const; diff --git a/Telegram/SourceFiles/dialogs/dialogs_main_list.h b/Telegram/SourceFiles/dialogs/dialogs_main_list.h index ef0c739b3..ccd3b1847 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_main_list.h +++ b/Telegram/SourceFiles/dialogs/dialogs_main_list.h @@ -57,14 +57,7 @@ private: void finalizeCloudUnread(); void recomputeFullListSize(); - auto unreadStateChangeNotifier(bool notify) { - const auto wasState = notify ? unreadState() : UnreadState(); - return gsl::finally([=] { - if (notify) { - _unreadStateChanges.fire_copy(wasState); - } - }); - } + inline auto unreadStateChangeNotifier(bool notify); FilterId _filterId = 0; IndexedList _all; @@ -82,4 +75,13 @@ private: }; +auto MainList::unreadStateChangeNotifier(bool notify) { + const auto wasState = notify ? unreadState() : UnreadState(); + return gsl::finally([=] { + if (notify) { + _unreadStateChanges.fire_copy(wasState); + } + }); +} + } // namespace Dialogs diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm index 218104689..59888a109 100644 --- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm +++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm @@ -117,7 +117,7 @@ QImage UnreadBadge(not_null peer) { Dialogs::Ui::PaintUnreadBadge( p, - unread, + counter, result.width(), result.height() - unreadSt.size, unreadSt,