From 0db6fc4ffbac2164216f890747de5619c00710e1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 30 Jun 2020 11:34:02 +0400 Subject: [PATCH] Toggle accounts by userpic in Main Menu. --- .../SourceFiles/window/window_main_menu.cpp | 20 +++++++++---------- .../SourceFiles/window/window_main_menu.h | 1 + 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index a85f4c963..327a77724 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -644,14 +644,17 @@ void MainMenu::setupCloudButton() { } void MainMenu::setupUserpicButton() { - _userpicButton->setClickedCallback([=] { - _controller->content()->choosePeer( - _controller->session().userPeerId(), - ShowAtUnreadMsgId); - }); + _userpicButton->setClickedCallback([=] { toggleAccounts(); }); _userpicButton->show(); } +void MainMenu::toggleAccounts() { + auto &settings = Core::App().settings(); + const auto shown = !settings.mainMenuAccountsShown(); + settings.setMainMenuAccountsShown(shown); + Core::App().saveSettingsDelayed(); +} + void MainMenu::setupAccounts() { const auto inner = _accounts->entity(); @@ -813,12 +816,7 @@ not_null*> MainMenu::setupAddAccount( void MainMenu::setupAccountsToggle() { _toggleAccounts->show(); - _toggleAccounts->setClickedCallback([=] { - auto &settings = Core::App().settings(); - const auto shown = !settings.mainMenuAccountsShown(); - settings.setMainMenuAccountsShown(shown); - Core::App().saveSettingsDelayed(); - }); + _toggleAccounts->setClickedCallback([=] { toggleAccounts(); }); } void MainMenu::parentResized() { diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h index 51e10a9bf..661364ab2 100644 --- a/Telegram/SourceFiles/window/window_main_menu.h +++ b/Telegram/SourceFiles/window/window_main_menu.h @@ -68,6 +68,7 @@ private: void initResetScaleButton(); void refreshMenu(); void refreshBackground(); + void toggleAccounts(); const not_null _controller; object_ptr _userpicButton;