FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-03 10:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.16.0' into dev

Browse Source 
# Conflicts:
#	README.md
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/calls/calls_call.cpp
#	Telegram/SourceFiles/core/local_url_handlers.cpp
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
#	Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
#	Telegram/lib_ui
#	snap/snapcraft.yaml
This commit is contained in:
AlexeyZavar
2024-04-01 23:56:12 +03:00
parent 79d6df2c01 707146daed
commit c6b42e2940
511 changed files with 21299 additions and 4877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/core/core_settings.cpp
+13 -2
View File
@@ -138,6 +138,8 @@ QByteArray Settings::serialize() const {
LogPosition(_windowPosition, u"Window"_q);
const auto mediaViewPosition = Serialize(_mediaViewPosition);
LogPosition(_mediaViewPosition, u"Viewer"_q);
const auto ivPosition = Serialize(_ivPosition);
LogPosition(_ivPosition, u"IV"_q);
const auto proxy = _proxy.serialize();
const auto skipLanguages = _skipTranslationLanguages.current();
@@ -213,7 +215,8 @@ QByteArray Settings::serialize() const {
+ Serialize::stringSize(_playbackDeviceId.current())
+ Serialize::stringSize(_captureDeviceId.current())
+ Serialize::stringSize(_callPlaybackDeviceId.current())
+ Serialize::stringSize(_callCaptureDeviceId.current());
+ Serialize::stringSize(_callCaptureDeviceId.current())
+ Serialize::bytearraySize(ivPosition);
auto result = QByteArray();
result.reserve(size);
@@ -357,7 +360,8 @@ QByteArray Settings::serialize() const {
<< _playbackDeviceId.current()
<< _captureDeviceId.current()
<< _callPlaybackDeviceId.current()
<< _callCaptureDeviceId.current();
<< _callCaptureDeviceId.current()
<< ivPosition;
}
Ensures(result.size() == size);
@@ -475,6 +479,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
base::flat_set<QString> recentEmojiSkip;
qint32 trayIconMonochrome = (_trayIconMonochrome.current() ? 1 : 0);
qint32 ttlVoiceClickTooltipHidden = _ttlVoiceClickTooltipHidden.current() ? 1 : 0;
QByteArray ivPosition;
stream >> themesAccentColors;
if (!stream.atEnd()) {
@@ -753,6 +758,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
? QString()
: legacyCallCaptureDeviceId;
}
if (!stream.atEnd()) {
stream >> ivPosition;
}
if (stream.status() != QDataStream::Ok) {
LOG(("App Error: "
"Bad data for Core::Settings::constructFromSerialized()"));
@@ -952,6 +960,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
_recentEmojiSkip = std::move(recentEmojiSkip);
_trayIconMonochrome = (trayIconMonochrome == 1);
_ttlVoiceClickTooltipHidden = (ttlVoiceClickTooltipHidden == 1);
if (!ivPosition.isEmpty()) {
_ivPosition = Deserialize(ivPosition);
}
}
QString Settings::getSoundPath(const QString &key) const {