From 455cb0d21bd3b72eb8d1c1735bc6e795970dd20a Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 19 May 2023 21:36:54 +0400 Subject: [PATCH] Fix build with Xcode. --- .../history/view/controls/history_view_voice_record_button.cpp | 1 - .../history/view/controls/history_view_voice_record_button.h | 1 - Telegram/SourceFiles/media/stories/media_stories_controller.h | 2 ++ Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp index 71a652f4d..9bed92be9 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp @@ -51,7 +51,6 @@ VoiceRecordButton::VoiceRecordButton( not_null parent, const style::RecordBar &st) : AbstractButton(parent) -, _st(st) , _blobs(std::make_unique( Blobs(), kLevelDuration, diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h index fc477b485..bd3f0150c 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h +++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h @@ -47,7 +47,6 @@ public: private: void init(); - const style::RecordBar &_st; std::unique_ptr _blobs; crl::time _lastUpdateTime = 0; diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h index 88a307dc0..2715ce8f5 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_controller.h +++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h @@ -53,6 +53,8 @@ struct SiblingLayout { QRect userpic; QRect nameBoundingRect; int nameFontSize = 0; + + friend inline bool operator==(SiblingLayout, SiblingLayout) = default; }; struct Layout { diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 01326c842..733c61851 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -1568,7 +1568,7 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) { + (_over == OverRotate ? _rotateNavOver : _rotateNavIcon) + (_over == OverMore ? _moreNavOver : _moreNavIcon) + ((_stories - && (_over == OverLeftStories && _over == OverRightStories)) + && (_over == OverLeftStories || _over == OverRightStories)) ? _stories->sibling(siblingType).layout.geometry : QRect()) + _headerNav