yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all legacy virtual desktop ids

Browse source 
Amends 0bd65de375.
This commit is contained in:
Vlad Zahorodnii 2024-02-21 14:28:15 +02:00
parent ade5d72c3a
commit 2c445ebf3c
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/useractions.cpp
View file

@ -496,7 +496,7 @@ void UserActionsMenu::desktopPopupAboutToShow()
const auto desktops = vds->desktops();
for (VirtualDesktop *desktop : desktops) {
action = m_desktopMenu->addAction(QStringLiteral("%1").arg(desktop->name().replace(QLatin1Char('&'), QStringLiteral("&&"))));
action = m_desktopMenu->addAction(desktop->name().replace(QLatin1Char('&'), QStringLiteral("&&")));
connect(action, &QAction::triggered, this, [this, desktop]() {
if (m_window) {
workspace()->sendWindowToDesktops(m_window, {desktop}, false);
@ -552,18 +552,9 @@ void UserActionsMenu::multipleDesktopsPopupAboutToShow()
m_multipleDesktopsMenu->addSeparator();
const uint BASE = 10;
const auto desktops = vds->desktops();
for (VirtualDesktop *desktop : desktops) {
const uint legacyId = desktop->x11DesktopNumber();
QString basic_name(QStringLiteral("%1 %2"));
if (legacyId < BASE) {
basic_name.prepend(QLatin1Char('&'));
}
QAction *action = m_multipleDesktopsMenu->addAction(basic_name.arg(legacyId).arg(desktop->name().replace(QLatin1Char('&'), QStringLiteral("&&"))));
QAction *action = m_multipleDesktopsMenu->addAction(desktop->name().replace(QLatin1Char('&'), QStringLiteral("&&")));
connect(action, &QAction::triggered, this, [this, desktop]() {
if (m_window) {
if (m_window->desktops().contains(desktop)) {