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

Imporved computing state of buttons in dictionaries manager.

This commit is contained in:
23rd 2020-02-06 00:39:58 +03:00
parent f377ac54fd
commit 62e0ced6a6
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Telegram/SourceFiles/boxes/dictionaries_manager.cpp
View File

@ -80,11 +80,14 @@ MTP::DedicatedLoader::Location GetDownloadLocation(int id) {
return MTP::DedicatedLoader::Location{ username, i->postId }; return MTP::DedicatedLoader::Location{ username, i->postId };
} }
DictState ComputeState(int id) { inline auto DictExists(int langId) {
// if (id == CurrentSetId()) { return Spellchecker::DictionaryExists(langId);
// return Active(); }
if (Spellchecker::DictionaryExists(id)) {
return Ready(); DictState ComputeState(int id, bool enabled) {
const auto result = enabled ? DictState(Active()) : DictState(Ready());
if (DictExists(id)) {
return result;
} }
return Available{ GetDownloadSize(id) }; return Available{ GetDownloadSize(id) };
} }
@ -210,14 +213,7 @@ auto AddButtonWithLoader(
) | rpl::then( ) | rpl::then(
button->toggledValue() button->toggledValue()
) | rpl::map([=](auto enabled) { ) | rpl::map([=](auto enabled) {
const auto &state = buttonState->current(); return ComputeState(id, enabled);
if (enabled && state.is<Ready>()) {
return DictState(Active());
}
if (!enabled && state.is<Active>()) {
return DictState(Ready());
}
return ComputeState(id);
}); });
}) | rpl::flatten_latest( }) | rpl::flatten_latest(
) | rpl::filter([=](const DictState &state) { ) | rpl::filter([=](const DictState &state) {
@ -255,7 +251,7 @@ void Inner::setupContent(Dictionaries enabledDictionaries) {
ranges::contains(enabledDictionaries, set.id)); ranges::contains(enabledDictionaries, set.id));
row->toggledValue( row->toggledValue(
) | rpl::start_with_next([=](auto enabled) { ) | rpl::start_with_next([=](auto enabled) {
if (enabled && Spellchecker::DictionaryExists(set.id)) { if (enabled && DictExists(set.id)) {
_enabledRows.push_back(set.id); _enabledRows.push_back(set.id);
} else { } else {
auto &rows = _enabledRows; auto &rows = _enabledRows;