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

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

Browse source
This commit is contained in:
Eric Kotato 2022-09-11 06:25:04 +03:00 • committed by Eric Kotato
parent b66ffddb80
commit 3d782c0fac
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -656,24 +656,17 @@ void SetupAccountsWrap(
} else if (which != Qt::RightButton) { } else if (which != Qt::RightButton) {
return; return;
} }
if (!state->menu && IsAltShift(raw->clickModifiers()) && !locked) {
state->menu = base::make_unique_q<Ui::PopupMenu>(
raw,
st::popupMenuWithIcons);
Window::MenuAddMarkAsReadAllChatsAction(
window,
Ui::Menu::CreateAddActionCallback(state->menu));
state->menu->popup(QCursor::pos());
return;
}
if (session == &window->session() || state->menu) { if (session == &window->session() || state->menu) {
return; return;
} }
const auto addAction = Ui::Menu::CreateAddActionCallback(
state->menu);
state->menu = base::make_unique_q<Ui::PopupMenu>( state->menu = base::make_unique_q<Ui::PopupMenu>(
raw, raw,
st::popupMenuExpandedSeparator); st::popupMenuExpandedSeparator);
const auto addAction = Ui::Menu::CreateAddActionCallback( Window::MenuAddMarkAsReadAllChatsAction(
state->menu); window,
Ui::Menu::CreateAddActionCallback(state->menu));
addAction(tr::lng_context_new_window(tr::now), [=] { addAction(tr::lng_context_new_window(tr::now), [=] {
Ui::PreventDelayedActivation(); Ui::PreventDelayedActivation();
callback(Qt::ControlModifier); callback(Qt::ControlModifier);
@ -686,12 +679,6 @@ void SetupAccountsWrap(
QGuiApplication::clipboard()->setText(phone.current().text); QGuiApplication::clipboard()->setText(phone.current().text);
}, &st::menuIconCopy); }, &st::menuIconCopy);
if (!locked) {
addAction(tr::lng_menu_activate(tr::now), [=] {
callback({});
}, &st::menuIconProfile);
}
auto logoutCallback = [=] { auto logoutCallback = [=] {
const auto callback = [=](Fn<void()> &&close) { const auto callback = [=](Fn<void()> &&close) {
close(); close();