kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Fix account hotkey when accounts are reordered

Browse source
This commit is contained in:
blank X 2022-03-12 20:11:26 +07:00
parent e5dcf48d43
commit 7ef51f18c9
No known key found for this signature in database
GPG key ID: CC15FC822C7F61F5
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View file

@ -103,6 +103,28 @@ int PinnedDialogsCount(
return result; 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 } // namespace
struct InnerWidget::CollapsedRow { struct InnerWidget::CollapsedRow {
@ -3174,8 +3196,8 @@ void InnerWidget::setupShortcuts() {
} }
} }
const auto accounts = &Core::App().domain().accounts(); const auto accounts = OrderedAccounts();
if (const auto accountsCount = int(accounts->size())) { if (const auto accountsCount = int(accounts.size())) {
auto &&accountShortcuts = ranges::views::zip( auto &&accountShortcuts = ranges::views::zip(
Shortcuts::kShowAccount, Shortcuts::kShowAccount,
ranges::views::ints(0, ranges::unreachable)); ranges::views::ints(0, ranges::unreachable));
@ -3186,7 +3208,7 @@ void InnerWidget::setupShortcuts() {
: std::clamp(index, 0, accountsCount - 1); : std::clamp(index, 0, accountsCount - 1);
request->check(command) && request->handle([=] { request->check(command) && request->handle([=] {
if (select <= accountsCount) { if (select <= accountsCount) {
const auto account = (*accounts)[select].account.get(); const auto account = accounts[select];
if (account != &Core::App().domain().active()) { if (account != &Core::App().domain().active()) {
Core::App().domain().maybeActivate(account); Core::App().domain().maybeActivate(account);
} }