Skip to content

Add total black embedded theme #30882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitaly-zdanevich wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add total black embedded theme #30882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Telegram/Resources/langs/lang.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_settings_theme_classic" = "Classic";
"lng_settings_theme_tinted" = "Tinted";
"lng_settings_theme_night" = "Night";
"lng_settings_theme_black" = "Black";
"lng_settings_theme_accent_title" = "Choose accent color";
"lng_settings_theme_system_accent_color" = "System accent color";
"lng_settings_data_storage" = "Data and storage";
Expand Down
1 change: 1 addition & 0 deletions Telegram/Resources/qrc/telegram/telegram.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
<file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
<file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>
<file alias="black.tdesktop-theme">../../night-custom-base.tdesktop-theme</file>
<file alias="day-custom-base.tdesktop-theme">../../day-custom-base.tdesktop-theme</file>
<file alias="night-custom-base.tdesktop-theme">../../night-custom-base.tdesktop-theme</file>
<file alias="icons/calls/hands.lottie">../../icons/calls/hands.lottie</file>
Expand Down
117 changes: 115 additions & 2 deletions Telegram/SourceFiles/window/themes/window_theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,98 @@ void applyBackground(QImage &&background, bool tiled, Instance *out) {
}
}

template <typename Callback>
void ApplyBlackThemePalette(Callback callback) {
for (const auto key : {
qstr("windowBg"),
qstr("windowShadowFgFallback"),
qstr("lightButtonBg"),
qstr("outlineButtonBg"),
qstr("menuBg"),
qstr("filterInputInactiveBg"),
qstr("filterInputActiveBg"),
qstr("titleBg"),
qstr("titleBgActive"),
qstr("titleButtonBg"),
qstr("titleButtonBgActive"),
qstr("titleButtonCloseBg"),
qstr("titleButtonCloseBgActive"),
qstr("boxBg"),
qstr("boxSearchBg"),
qstr("contactsBg"),
qstr("introBg"),
qstr("dialogsBg"),
qstr("searchedBarBg"),
qstr("topBarBg"),
qstr("emojiPanBg"),
qstr("emojiPanCategories"),
qstr("historyUnreadBarBg"),
qstr("msgInBg"),
qstr("msgOutBg"),
qstr("msgServiceBg"),
qstr("reportSpamBg"),
qstr("historyToDownBg"),
qstr("historyComposeAreaBg"),
qstr("historyPinnedBg"),
qstr("historyReplyBg"),
qstr("historyComposeButtonBg"),
qstr("mainMenuBg"),
qstr("mediaPlayerBg"),
qstr("mediaviewFileBg"),
qstr("mediaviewBg"),
qstr("notificationBg"),
qstr("callBg"),
qstr("botKbBg"),
qstr("sideBarBg"),
}) {
callback(key);
}
}

[[nodiscard]] QImage BlackThemeBackground() {
auto result = QImage(1, 1, QImage::Format_RGB32);
result.fill(QColor(0, 0, 0));
return result;
}

void SaveBlackThemeBackground(const QImage &background, Cached *cache) {
if (!cache) {
return;
}
cache->background = QByteArray();
auto buffer = QBuffer(&cache->background);
background.save(&buffer, "BMP");
cache->tiled = false;
}

void ApplyBlackThemeOverrides(not_null<Instance*> out, Cached *cache) {
const auto black = QColor(0, 0, 0);
ApplyBlackThemePalette([&](QLatin1String key) {
out->palette.setColor(key, black);
});

out->background = BlackThemeBackground();
out->tiled = false;
if (cache) {
cache->colors = out->palette.save();
SaveBlackThemeBackground(out->background, cache);
}
}

void ApplyBlackThemeOverrides(Cached *cache) {
ApplyBlackThemePalette([](QLatin1String key) {
style::main_palette::setColor(key, 0, 0, 0, 255);
});

auto background = BlackThemeBackground();
if (cache) {
cache->colors = style::main_palette::save();
SaveBlackThemeBackground(background, cache);
}
Background()->setThemeData(std::move(background), false);
Background()->saveAdjustableColors();
}

enum class LoadResult {
Loaded,
Failed,
Expand Down Expand Up @@ -426,8 +518,12 @@ bool InitializeFromSaved(Saved &&saved) {
}

const auto editing = ReadEditingPalette();
const auto black = !editing
&& (saved.object.pathAbsolute == BlackThemePath());
GlobalBackground.createIfNull();
if (!editing && InitializeFromCache(saved.object.content, saved.cache)) {
if (!editing
&& !black
&& InitializeFromCache(saved.object.content, saved.cache)) {
return true;
}

Expand All @@ -436,6 +532,9 @@ bool InitializeFromSaved(Saved &&saved) {
DEBUG_LOG(("Theme: Could not load from saved."));
return false;
}
if (black) {
ApplyBlackThemeOverrides(&saved.cache);
}
if (editing) {
Background()->setEditingTheme(ReadCloudFromText(*editing));
} else {
Expand Down Expand Up @@ -1223,6 +1322,11 @@ void ChatBackground::reapplyWithNightMode(
if (!loaded) {
return false;
}
if (path == BlackThemePath()) {
ApplyBlackThemeOverrides(
&preview->instance,
&preview->instance.cached);
}
Apply(std::move(preview));
return true;
}();
Expand Down Expand Up @@ -1484,7 +1588,16 @@ bool LoadFromFile(
if (outContent) {
*outContent = content;
}
return LoadTheme(content, colorizer, std::nullopt, outCache, out);
const auto loaded = LoadTheme(
content,
colorizer,
std::nullopt,
outCache,
out);
if (loaded && path == BlackThemePath()) {
ApplyBlackThemeOverrides(out, outCache);
}
return loaded;
}

bool LoadFromContent(
Expand Down
30 changes: 29 additions & 1 deletion Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Window {
namespace Theme {
namespace {

constexpr auto kMaxAccentColors = 3;
constexpr auto kMaxAccentColors = 5;
constexpr auto kDayBaseFile = ":/gui/day-custom-base.tdesktop-theme"_cs;
constexpr auto kNightBaseFile = ":/gui/night-custom-base.tdesktop-theme"_cs;

Expand Down Expand Up @@ -133,6 +133,7 @@ style::colorizer ColorizerFrom(
result.lightnessMax = 160;
break;
case EmbeddedType::Night:
case EmbeddedType::Black:
result.keepContrast = base::flat_map<QLatin1String, Pair>{ {
//{ qstr("windowFgActive"), Pair{ cColor("5288c1"), cColor("17212b") } }, // windowBgActive
{ qstr("activeButtonFg"), Pair{ cColor("2f6ea5"), cColor("17212b") } }, // activeButtonBg
Expand Down Expand Up @@ -189,6 +190,10 @@ std::optional<QColor> SystemAccentColor() {
return accent.isValid() ? std::make_optional(accent) : std::nullopt;
}

QString BlackThemePath() {
return u":/gui/black.tdesktop-theme"_q;
}

style::colorizer ColorizerForTheme(const QString &absolutePath) {
if (!IsEmbeddedTheme(absolutePath)) {
return {};
Expand Down Expand Up @@ -281,6 +286,17 @@ std::vector<EmbeddedScheme> EmbeddedThemes() {
":/gui/night-green.tdesktop-theme",
qColor("3fc1b0")
},
EmbeddedScheme{
EmbeddedType::Black,
qColor("000000"),
qColor("265e8c"),
qColor("24292e"),
qColor("24292e"),
qColor("5ca7d4"),
name(tr::lng_settings_theme_black),
BlackThemePath(),
qColor("5288c1")
},
};
}

Expand Down Expand Up @@ -333,6 +349,17 @@ std::vector<QColor> DefaultAccentColors(EmbeddedType type) {
qColor("7b8799"),
qColor("cbac67"),
};
case EmbeddedType::Black:
return {
qColor("58bfe8"),
qColor("466f42"),
qColor("aa6084"),
qColor("a46d3c"),
qColor("917bbd"),
qColor("ab5149"),
qColor("697b97"),
qColor("9b834b"),
};
}
Unexpected("Type in Window::Theme::AccentColors.");
}
Expand Down Expand Up @@ -421,6 +448,7 @@ bool AccentColors::setFromSerialized(const QByteArray &serialized) {
case EmbeddedType::DayBlue:
case EmbeddedType::Night:
case EmbeddedType::NightGreen:
case EmbeddedType::Black:
data.emplace(uncheckedType, color);
break;
default:
Expand Down
2 changes: 2 additions & 0 deletions Telegram/SourceFiles/window/themes/window_themes_embedded.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enum class EmbeddedType {
Default,
Night,
NightGreen,
Black,
};

struct EmbeddedScheme {
Expand Down Expand Up @@ -52,6 +53,7 @@ class AccentColors final {
const QColor &color);
[[nodiscard]] std::optional<QColor> SystemAccentColor();
[[nodiscard]] style::colorizer ColorizerForTheme(const QString &absolutePath);
[[nodiscard]] QString BlackThemePath();

void Colorize(
EmbeddedScheme &scheme,
Expand Down