From 36741ab780cbc6a3c259a57746904d25af101070 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 2 Nov 2024 22:19:54 +0300 Subject: [PATCH] Reused setting for legacy iv zoom for chat filters view type. --- Telegram/SourceFiles/core/core_settings.cpp | 20 +++++++++++++++++--- Telegram/SourceFiles/core/core_settings.h | 5 +++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp index 2ef80a80d..5a22f6d00 100644 --- a/Telegram/SourceFiles/core/core_settings.cpp +++ b/Telegram/SourceFiles/core/core_settings.cpp @@ -396,7 +396,7 @@ QByteArray Settings::serialize() const { << qint32(!_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2) << _tonsiteStorageToken << qint32(_includeMutedCounterFolders ? 1 : 0) - << qint32(0) // Old IV zoom + << qint32(_chatFiltersHorizontal.current() ? 1 : 0) << qint32(_skipToastsInFocus ? 1 : 0) << qint32(_recordVideoMessages ? 1 : 0) << SerializeVideoQuality(_videoQuality) @@ -528,6 +528,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) { qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0; qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0; quint32 videoQuality = SerializeVideoQuality(_videoQuality); + quint32 chatFiltersHorizontal = _chatFiltersHorizontal.current() ? 1 : 0; stream >> themesAccentColors; if (!stream.atEnd()) { @@ -838,8 +839,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) { stream >> includeMutedCounterFolders; } if (!stream.atEnd()) { - qint32 oldIvZoom = 0; - stream >> oldIvZoom; + stream >> chatFiltersHorizontal; } if (!stream.atEnd()) { stream >> skipToastsInFocus; @@ -1068,6 +1068,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) { _skipToastsInFocus = (skipToastsInFocus == 1); _recordVideoMessages = (recordVideoMessages == 1); _videoQuality = DeserializeVideoQuality(videoQuality); + _chatFiltersHorizontal = (chatFiltersHorizontal == 1); } QString Settings::getSoundPath(const QString &key) const { @@ -1459,6 +1460,7 @@ void Settings::resetOnLastLogout() { _ivZoom = 100; _recordVideoMessages = false; _videoQuality = {}; + _chatFiltersHorizontal = false; _recentEmojiPreload.clear(); _recentEmoji.clear(); @@ -1634,4 +1636,16 @@ void Settings::setVideoQuality(Media::VideoQuality value) { _videoQuality = value; } +bool Settings::chatFiltersHorizontal() const { + return _chatFiltersHorizontal.current(); +} + +rpl::producer Settings::chatFiltersHorizontalValue() const { + return _chatFiltersHorizontal.value(); +} + +void Settings::setChatFiltersHorizontal(bool value) { + _chatFiltersHorizontal = value; +} + } // namespace Core diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h index 3838463f3..d7933efaf 100644 --- a/Telegram/SourceFiles/core/core_settings.h +++ b/Telegram/SourceFiles/core/core_settings.h @@ -929,6 +929,10 @@ public: [[nodiscard]] rpl::producer ivZoomValue() const; void setIvZoom(int value); + [[nodiscard]] bool chatFiltersHorizontal() const; + [[nodiscard]] rpl::producer chatFiltersHorizontalValue() const; + void setChatFiltersHorizontal(bool value); + [[nodiscard]] Media::VideoQuality videoQuality() const; void setVideoQuality(Media::VideoQuality quality); @@ -1070,6 +1074,7 @@ private: QByteArray _tonsiteStorageToken; rpl::variable _ivZoom = 100; Media::VideoQuality _videoQuality; + rpl::variable _chatFiltersHorizontal = false; bool _tabbedReplacedWithInfo = false; // per-window rpl::event_stream _tabbedReplacedWithInfoValue; // per-window