From eb40edae221c400ab36af4f356f4c17b6f59952d Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 27 Nov 2020 19:55:18 +0300 Subject: [PATCH] Fix group call members list height. --- Telegram/SourceFiles/calls/calls_group_members.cpp | 13 ++++++++++++- Telegram/SourceFiles/calls/calls_group_members.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index a26f63e790..543ce6fdfa 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -478,7 +478,18 @@ int GroupMembers::desiredHeight() const { }(); desired += std::max(count, _list->fullRowsCount()) * st::groupCallMembersList.item.height; - return std::max(height(), desired); + return desired; +} + +rpl::producer GroupMembers::desiredHeightValue() const { + const auto controller = static_cast( + _listController.get()); + return rpl::combine( + heightValue(), + controller->fullCountValue() + ) | rpl::map([=] { + return desiredHeight(); + }); } void GroupMembers::setupHeader(not_null call) { diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h index 5b6d39df64..9cc8fcc8d7 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.h +++ b/Telegram/SourceFiles/calls/calls_group_members.h @@ -35,6 +35,7 @@ public: }; [[nodiscard]] int desiredHeight() const; + [[nodiscard]] rpl::producer desiredHeightValue() const override; [[nodiscard]] rpl::producer toggleMuteRequests() const; private: