diff --git a/Telegram/Resources/day-custom-base.tdesktop-theme b/Telegram/Resources/day-custom-base.tdesktop-theme new file mode 100644 index 000000000..2b662d1a3 Binary files /dev/null and b/Telegram/Resources/day-custom-base.tdesktop-theme differ diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc index c34f48123..437895e44 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 + ../../day-custom-base.tdesktop-theme ../../night-custom-base.tdesktop-theme ../../icons/calls/hands.lottie ../../icons/calls/voice.lottie diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index 0a4b7d7c1..3960c4e05 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 kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs; constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs; [[nodiscard]] Fn PreparePaletteCallback( @@ -93,21 +94,16 @@ constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs; ? ColorizerFrom(*i, *accent) : style::colorizer(); - if (dark) { - auto instance = Instance(); - const auto loaded = LoadFromFile( - kNightBaseFile.utf16(), - &instance, - nullptr, - nullptr, - colorizer); - Assert(loaded); - - palette.finalize(); - palette = instance.palette; - } else { - palette.finalize(colorizer); - } + auto instance = Instance(); + const auto loaded = LoadFromFile( + (dark ? kNightBaseFile : kDayBaseFile).utf16(), + &instance, + nullptr, + nullptr, + colorizer); + Assert(loaded); + palette.finalize(); + palette = instance.palette; }; }