From a4e5ea01dc26db74951207b1fbae810d36db6677 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 4 Nov 2023 13:41:50 +0300 Subject: [PATCH] Added icon to language button in settings from intro. --- Telegram/SourceFiles/settings/settings_intro.cpp | 2 +- Telegram/SourceFiles/settings/settings_main.cpp | 7 +++---- Telegram/SourceFiles/settings/settings_main.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp index 83c930c1a..6aecfc0b9 100644 --- a/Telegram/SourceFiles/settings/settings_intro.cpp +++ b/Telegram/SourceFiles/settings/settings_intro.cpp @@ -63,7 +63,7 @@ object_ptr CreateIntroSettings( AddDivider(result); AddSkip(result); - SetupLanguageButton(window, result, false); + SetupLanguageButton(window, result); SetupConnectionType(window, &window->account(), result); AddSkip(result); if (HasUpdate()) { diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index f00224827..43194a4bd 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -272,8 +272,7 @@ void SetupPowerSavingButton( void SetupLanguageButton( not_null window, - not_null container, - bool icon) { + not_null container) { const auto button = AddButtonWithLabel( container, tr::lng_settings_language(), @@ -282,8 +281,8 @@ void SetupLanguageButton( ) | rpl::then( Lang::GetInstance().idChanges() ) | rpl::map([] { return Lang::GetInstance().nativeName(); }), - icon ? st::settingsButton : st::settingsButtonNoIcon, - { icon ? &st::menuIconTranslate : nullptr }); + st::settingsButton, + { &st::menuIconTranslate }); const auto guard = Ui::CreateChild(button.get()); button->addClickHandler([=] { const auto m = button->clickModifiers(); diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/settings_main.h index 4c1529d7d..10220623d 100644 --- a/Telegram/SourceFiles/settings/settings_main.h +++ b/Telegram/SourceFiles/settings/settings_main.h @@ -22,8 +22,7 @@ namespace Settings { void SetupLanguageButton( not_null window, - not_null container, - bool icon = true); + not_null container); bool HasInterfaceScale(); void SetupInterfaceScale( not_null window,