procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix default night mode applying.

This commit is contained in:
John Preston 2018-08-02 15:47:50 +03:00
parent 06bf67c146
commit 36b7c1c720
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Telegram/SourceFiles/window/themes/window_theme.cpp
View File

@ -354,6 +354,19 @@ void ApplyDefaultWithNightMode(bool nightMode) {
} }
} }
void WriteAppliedTheme() {
auto saved = Saved();
saved.pathRelative = instance->applying.pathRelative;
saved.pathAbsolute = instance->applying.pathAbsolute;
saved.content = std::move(instance->applying.content);
saved.cache = std::move(instance->applying.cached);
Local::writeTheme(saved);
}
void ClearApplying() {
instance->applying = Data::Applying();
}
} // namespace } // namespace
ChatBackground::AdjustableColor::AdjustableColor(style::color data) ChatBackground::AdjustableColor::AdjustableColor(style::color data)
@ -751,7 +764,7 @@ void ChatBackground::toggleNightMode() {
_nightMode = oldNightMode; _nightMode = oldNightMode;
auto oldTileValue = (_nightMode ? _tileNightValue : _tileDayValue); auto oldTileValue = (_nightMode ? _tileNightValue : _tileDayValue);
const auto applied = [&] { const auto alreadyOnDisk = [&] {
if (read.content.isEmpty()) { if (read.content.isEmpty()) {
return false; return false;
} }
@ -770,7 +783,7 @@ void ChatBackground::toggleNightMode() {
Apply(std::move(preview)); Apply(std::move(preview));
return true; return true;
}(); }();
if (!applied) { if (!alreadyOnDisk) {
path = newNightMode ? NightThemePath() : QString(); path = newNightMode ? NightThemePath() : QString();
ApplyDefaultWithNightMode(newNightMode); ApplyDefaultWithNightMode(newNightMode);
} }
@ -782,15 +795,16 @@ void ChatBackground::toggleNightMode() {
// Restore the value, it was set inside theme testing. // Restore the value, it was set inside theme testing.
(oldNightMode ? _tileNightValue : _tileDayValue) = oldTileValue; (oldNightMode ? _tileNightValue : _tileDayValue) = oldTileValue;
// We don't call full KeepApplied() here, because if (!alreadyOnDisk) {
// we don't need to write theme or overwrite current background. // First-time switch to default night mode should write it.
instance->applying = Data::Applying(); WriteAppliedTheme();
Local::writeSettings(); }
ClearApplying();
keepApplied(path, false); keepApplied(path, false);
if (tile() != _tileForRevert) { if (tile() != _tileForRevert) {
Local::writeUserSettings(); Local::writeUserSettings();
} }
Local::writeSettings();
if (!Local::readBackground()) { if (!Local::readBackground()) {
setImage(kThemeBackground); setImage(kThemeBackground);
} }
@ -882,14 +896,10 @@ void KeepApplied() {
if (!AreTestingTheme()) { if (!AreTestingTheme()) {
return; return;
} }
auto saved = Saved(); const auto path = instance->applying.pathAbsolute;
saved.pathRelative = instance->applying.pathRelative; WriteAppliedTheme();
saved.pathAbsolute = instance->applying.pathAbsolute; ClearApplying();
saved.content = std::move(instance->applying.content); Background()->keepApplied(path, true);
saved.cache = std::move(instance->applying.cached);
Local::writeTheme(saved);
instance->applying = Data::Applying();
Background()->keepApplied(saved.pathAbsolute, true);
} }
void Revert() { void Revert() {
@ -899,7 +909,7 @@ void Revert() {
style::main_palette::load(instance->applying.paletteForRevert); style::main_palette::load(instance->applying.paletteForRevert);
Background()->saveAdjustableColors(); Background()->saveAdjustableColors();
instance->applying = Data::Applying(); ClearApplying();
Background()->revert(); Background()->revert();
} }