Fix autoupdate/dictionaries show/hide in settings.

Author: john-preston

Telegram/SourceFiles/settings/sections/settings_advanced.cpp

@@ -828,52 +828,37 @@ void BuildSpellcheckerSection(SectionBuilder &builder) {
 		}, spellchecker->lifetime());
 	}
 
-	const auto sliding = (!isSystem && container)
-		? container->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				container,
-				object_ptr<Ui::VerticalLayout>(container)))
-		: nullptr;
-	const auto inner = sliding ? sliding->entity() : nullptr;
-
 	if (!isSystem) {
-		const auto autoDownload = builder.addButton({
-			.id = u"advanced/auto_download_dictionaries"_q,
-			.title = tr::lng_settings_auto_download_dictionaries(),
-			.st = &st::settingsButtonNoIcon,
-			.container = inner,
-			.toggled = rpl::single(settings->autoDownloadDictionaries()),
-			.keywords = { u"dictionary"_q, u"download"_q, u"spellcheck"_q },
-		});
-
-		if (autoDownload) {
-			autoDownload->toggledValue(
-			) | rpl::filter([=](bool enabled) {
-				return (enabled != settings->autoDownloadDictionaries());
-			}) | rpl::on_next([=](bool enabled) {
-				settings->setAutoDownloadDictionaries(enabled);
-				Core::App().saveSettingsDelayed();
-			}, autoDownload->lifetime());
-		}
+		builder.scope([&] {
+			const auto autoDownload = builder.addButton({
+				.id = u"advanced/auto_download_dictionaries"_q,
+				.title = tr::lng_settings_auto_download_dictionaries(),
+				.st = &st::settingsButtonNoIcon,
+				.toggled = rpl::single(settings->autoDownloadDictionaries()),
+				.keywords = { u"dictionary"_q, u"download"_q, u"spellcheck"_q },
+			});
 
-		builder.addButton({
-			.id = u"advanced/manage_dictionaries"_q,
-			.title = tr::lng_settings_manage_dictionaries(),
-			.st = &st::settingsButtonNoIcon,
-			.container = inner,
-			.label = Spellchecker::ButtonManageDictsState(session),
-			.onClick = [=] {
-				controller->show(Box<Ui::ManageDictionariesBox>(session));
-			},
-			.keywords = { u"dictionary"_q, u"manage"_q, u"spellcheck"_q },
-		});
+			if (autoDownload) {
+				autoDownload->toggledValue(
+				) | rpl::filter([=](bool enabled) {
+					return (enabled != settings->autoDownloadDictionaries());
+				}) | rpl::on_next([=](bool enabled) {
+					settings->setAutoDownloadDictionaries(enabled);
+					Core::App().saveSettingsDelayed();
+				}, autoDownload->lifetime());
+			}
 
-		if (spellchecker && sliding) {
-			spellchecker->toggledValue(
-			) | rpl::on_next([=](bool enabled) {
-				sliding->toggle(enabled, anim::type::normal);
-			}, container->lifetime());
-		}
+			builder.addButton({
+				.id = u"advanced/manage_dictionaries"_q,
+				.title = tr::lng_settings_manage_dictionaries(),
+				.st = &st::settingsButtonNoIcon,
+				.label = Spellchecker::ButtonManageDictsState(session),
+				.onClick = [=] {
+					controller->show(Box<Ui::ManageDictionariesBox>(session));
+				},
+				.keywords = { u"dictionary"_q, u"manage"_q, u"spellcheck"_q },
+			});
+		}, spellchecker ? spellchecker->toggledValue() : nullptr);
 	}
 
 	builder.addSkip();
@@ -933,36 +918,44 @@ void BuildUpdateSection(SectionBuilder &builder, bool atTop) {
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
 
-	const auto options = container
-		? container->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				container,
-				object_ptr<Ui::VerticalLayout>(container)))
-		: nullptr;
-	const auto inner = options ? options->entity() : nullptr;
+	auto optionsShown = rpl::producer<bool>(nullptr);
+	if (toggle) {
+		Core::UpdateChecker checker;
+		optionsShown = rpl::combine(
+			toggle->toggledValue(),
+			downloading->events_starting_with(
+				checker.state() == Core::UpdateChecker::State::Download)
+		) | rpl::map([](bool check, bool downloading) {
+			return check && !downloading;
+		});
+	}
+	auto options = (Ui::SlideWrap<Ui::VerticalLayout>*)nullptr;
+	auto install = (Ui::SettingsButton*)nullptr;
+	auto check = (Ui::SettingsButton*)nullptr;
+	builder.scope([&] {
+		install = cAlphaVersion()
+			? nullptr
+			: builder.addButton({
+				.id = u"advanced/install_beta"_q,
+				.title = tr::lng_settings_install_beta(),
+				.st = &st::settingsButtonNoIcon,
+				.toggled = rpl::single(cInstallBetaVersion()),
+				.keywords = { u"beta"_q, u"update"_q, u"version"_q },
+			});
 
-	const auto install = cAlphaVersion()
-		? nullptr
-		: builder.addButton({
-			.id = u"advanced/install_beta"_q,
-			.title = tr::lng_settings_install_beta(),
+		check = builder.addButton({
+			.id = u"advanced/check_update"_q,
+			.title = tr::lng_settings_check_now(),
 			.st = &st::settingsButtonNoIcon,
-			.container = inner,
-			.toggled = rpl::single(cInstallBetaVersion()),
-			.keywords = { u"beta"_q, u"update"_q, u"version"_q },
+			.onClick = [] {
+				Core::UpdateChecker checker;
+				cSetLastUpdateCheck(0);
+				checker.start();
+			},
+			.keywords = { u"check"_q, u"update"_q, u"version"_q },
 		});
-
-	const auto check = builder.addButton({
-		.id = u"advanced/check_update"_q,
-		.title = tr::lng_settings_check_now(),
-		.st = &st::settingsButtonNoIcon,
-		.container = inner,
-		.onClick = [] {
-			Core::UpdateChecker checker;
-			cSetLastUpdateCheck(0);
-			checker.start();
-		},
-		.keywords = { u"check"_q, u"update"_q, u"version"_q },
+	}, std::move(optionsShown), [&](auto wrap) {
+		options = wrap;
 	});
 
 	if (check && container) {
@@ -1033,13 +1026,6 @@ void BuildUpdateSection(SectionBuilder &builder, bool atTop) {
 		}
 
 		Core::UpdateChecker checker;
-		options->toggleOn(rpl::combine(
-			toggle->toggledValue(),
-			downloading->events_starting_with(
-				checker.state() == Core::UpdateChecker::State::Download)
-		) | rpl::map([](bool check, bool downloading) {
-			return check && !downloading;
-		}));
 
 		checker.checking() | rpl::on_next([=] {
 			options->setAttribute(Qt::WA_TransparentForMouseEvents);