[Improvement] Do not hide "mark as read" under Alt+Shift modfiers

This commit is contained in:
Eric Kotato 2022-09-11 06:25:04 +03:00 committed by Eric Kotato
parent c62782b8c5
commit 2e0bcb1ead

View file

@ -678,33 +678,21 @@ void SetupAccountsWrap(
}
const auto addAction = Ui::Menu::CreateAddActionCallback(
state->menu);
if (!state->menu && IsAltShift(raw->clickModifiers()) && !locked) {
state->menu = base::make_unique_q<Ui::PopupMenu>(
raw,
st::popupMenuWithIcons);
Window::MenuAddMarkAsReadAllChatsAction(window, addAction);
state->menu->popup(QCursor::pos());
return;
}
if (&session->account() == &Core::App().activeAccount()
|| state->menu) {
return;
}
state->menu = base::make_unique_q<Ui::PopupMenu>(
raw,
st::popupMenuWithIcons);
if (&session->account() != &Core::App().activeAccount()) {
addAction(tr::lng_menu_activate(tr::now), [=] {
Core::App().domain().activate(&session->account());
}, &st::menuIconProfile);
}
addAction(tr::lng_profile_copy_phone(tr::now), [=] {
const auto phone = rpl::variable<TextWithEntities>(
Info::Profile::PhoneValue(session->user()));
QGuiApplication::clipboard()->setText(phone.current().text);
}, &st::menuIconCopy);
if (!locked) {
addAction(tr::lng_menu_activate(tr::now), [=] {
Core::App().domain().activate(&session->account());
}, &st::menuIconProfile);
}
auto logoutCallback = [=] {
const auto callback = [=](Fn<void()> &&close) {
close();