diff options
Diffstat (limited to '333.patch')
| -rw-r--r-- | 333.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/333.patch b/333.patch new file mode 100644 index 000000000000..c101e314b267 --- /dev/null +++ b/333.patch @@ -0,0 +1,62 @@ +From 7ef51f18c966b29d56b4af7cb3edc83bcc7efc2f Mon Sep 17 00:00:00 2001 +From: blank X <blankie@nixnetmail.com> +Date: Sat, 12 Mar 2022 20:11:26 +0700 +Subject: [PATCH] Fix account hotkey when accounts are reordered + +--- + .../dialogs/dialogs_inner_widget.cpp | 28 +++++++++++++++++-- + 1 file changed, 25 insertions(+), 3 deletions(-) + +diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +index df918d584d..aa10524e0b 100644 +--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp ++++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +@@ -103,6 +103,28 @@ int PinnedDialogsCount( + return result; + } + ++// Duplicated code from window/window_main_menu.cpp ++[[nodiscard]] std::vector<not_null<Main::Account*>> OrderedAccounts() { ++ const auto order = Core::App().settings().accountsOrder(); ++ auto accounts = ranges::views::all( ++ Core::App().domain().accounts() ++ ) | ranges::views::transform([](const Main::Domain::AccountWithIndex &a) { ++ return not_null{ a.account.get() }; ++ }) | ranges::to_vector; ++ ranges::stable_sort(accounts, [&]( ++ not_null<Main::Account*> a, ++ not_null<Main::Account*> b) { ++ const auto aIt = a->sessionExists() ++ ? ranges::find(order, a->session().uniqueId()) ++ : end(order); ++ const auto bIt = b->sessionExists() ++ ? ranges::find(order, b->session().uniqueId()) ++ : end(order); ++ return aIt < bIt; ++ }); ++ return accounts; ++} ++ + } // namespace + + struct InnerWidget::CollapsedRow { +@@ -3174,8 +3196,8 @@ void InnerWidget::setupShortcuts() { + } + } + +- const auto accounts = &Core::App().domain().accounts(); +- if (const auto accountsCount = int(accounts->size())) { ++ const auto accounts = OrderedAccounts(); ++ if (const auto accountsCount = int(accounts.size())) { + auto &&accountShortcuts = ranges::views::zip( + Shortcuts::kShowAccount, + ranges::views::ints(0, ranges::unreachable)); +@@ -3186,7 +3208,7 @@ void InnerWidget::setupShortcuts() { + : std::clamp(index, 0, accountsCount - 1); + request->check(command) && request->handle([=] { + if (select <= accountsCount) { +- const auto account = (*accounts)[select].account.get(); ++ const auto account = accounts[select]; + if (account != &Core::App().domain().active()) { + Core::App().domain().maybeActivate(account); + } |