From 2c7d8858c0d65c092cddfa19831b2b0541de8b6a Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 19 Sep 2021 11:40:15 +0300 Subject: [PATCH] Base custom chat themes on a separate dark theme. --- .../Resources/night-custom-base.tdesktop-theme | Bin 0 -> 8755 bytes Telegram/Resources/qrc/telegram/telegram.qrc | 1 + .../window/window_session_controller.cpp | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Telegram/Resources/night-custom-base.tdesktop-theme diff --git a/Telegram/Resources/night-custom-base.tdesktop-theme b/Telegram/Resources/night-custom-base.tdesktop-theme new file mode 100644 index 0000000000000000000000000000000000000000..2c5f6d72bfb209a6d8fd36af211b58ec98ef740b GIT binary patch literal 8755 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc index 4d579d055f..c34f481233 100644 --- a/Telegram/Resources/qrc/telegram/telegram.qrc +++ b/Telegram/Resources/qrc/telegram/telegram.qrc @@ -60,6 +60,7 @@ ../../day-blue.tdesktop-theme ../../night.tdesktop-theme ../../night-green.tdesktop-theme + ../../night-custom-base.tdesktop-theme ../../icons/calls/hands.lottie ../../icons/calls/voice.lottie ../../art/recording/recording_info_audio.svg diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index 1a3c944580..0a4b7d7c13 100644 --- a/Telegram/SourceFiles/window/window_session_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -76,6 +76,7 @@ namespace Window { namespace { constexpr auto kMaxChatEntryHistorySize = 50; +constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs; [[nodiscard]] Fn PreparePaletteCallback( bool dark, @@ -95,7 +96,7 @@ constexpr auto kMaxChatEntryHistorySize = 50; if (dark) { auto instance = Instance(); const auto loaded = LoadFromFile( - i->path, + kNightBaseFile.utf16(), &instance, nullptr, nullptr,