void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed closing of main menu on activate account in separated window.

Browse source
This commit is contained in:
23rd 2023-04-05 20:27:11 +03:00 • committed by John Preston
parent 90cea58d28
commit 127bafa254
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/settings/settings_information.cpp
View file

@ -676,8 +676,7 @@ void SetupAccountsWrap(
state->menu); state->menu);
addAction(tr::lng_context_new_window(tr::now), [=] { addAction(tr::lng_context_new_window(tr::now), [=] {
Ui::PreventDelayedActivation(); Ui::PreventDelayedActivation();
Core::App().ensureSeparateWindowForAccount(account); callback(Qt::ControlModifier);
Core::App().domain().maybeActivate(account);
}, &st::menuIconNewWindow); }, &st::menuIconNewWindow);
Window::AddSeparatorAndShiftUp(addAction); Window::AddSeparatorAndShiftUp(addAction);
@ -894,16 +893,18 @@ void AccountsList::rebuild() {
auto activate = [=, guard = _accountSwitchGuard.make_guard()]{ auto activate = [=, guard = _accountSwitchGuard.make_guard()]{
if (guard) { if (guard) {
_reorder->finishReordering(); _reorder->finishReordering();
if (newWindow) {
Core::App().ensureSeparateWindowForAccount(
account);
}
Core::App().domain().maybeActivate(account);
} }
if (newWindow) {
Core::App().ensureSeparateWindowForAccount(
account);
}
Core::App().domain().maybeActivate(account);
}; };
if (Core::App().separateWindowForAccount(account)) { if (Core::App().separateWindowForAccount(account)) {
_currentAccountActivations.fire({});
activate(); activate();
} else { } else {
_currentAccountActivations.fire({});
base::call_delayed( base::call_delayed(
st::defaultRippleAnimation.hideDuration, st::defaultRippleAnimation.hideDuration,
account, account,