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

kcmkwin/rules: Fix suggested values for virtual desktops rule

Browse source 
If the virtual desktops rule is created, only the last virtual desktop
the window is on is going to be checked.

With this, all virtual desktops that the window is currently on will be
checked.

Technically, it's an api breaking change, but the window rules kcm is
the primary user of queryWindowInfo() so I don't think it's a big deal.
This commit is contained in:
Vlad Zahorodnii 2021-09-29 14:01:32 +03:00
parent 57a8d5ca50
commit 66badd905b
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dbusinterface.cpp
View file

@ -202,7 +202,7 @@ QVariantMap clientToVariantMap(const AbstractClient *c)
{QStringLiteral("y"), c->y()},
{QStringLiteral("width"), c->width()},
{QStringLiteral("height"), c->height()},
{QStringLiteral("x11DesktopNumber"), c->desktop()},
{QStringLiteral("desktops"), c->desktopIds()},
{QStringLiteral("minimized"), c->isMinimized()},
{QStringLiteral("shaded"), c->isShade()},
{QStringLiteral("fullscreen"), c->isFullScreen()},

15
src/kcmkwin/kwinrules/rulesmodel.cpp
View file

@ -670,7 +670,8 @@ const QHash<QString, QString> RulesModel::x11PropertyHash()
{ "skipPager", "skippager" },
{ "skipSwitcher", "skipswitcher" },
{ "type", "type" },
{ "desktopFile", "desktopfile" }
{ "desktopFile", "desktopfile" },
{ "desktops", "desktops" },
};
return propertyToRule;
};
@ -699,18 +700,6 @@ void RulesModel::setSuggestedProperties(const QVariantMap &info)
m_rules["wmclass"]->setSuggestedValue(wmsimpleclass);
m_rules["wmclasshelper"]->setSuggestedValue(wmcompleteclass);
//TODO: Make the DBus method `queryWindowInfo` return the list of desktop IDs and use them directly
if (info.value("x11DesktopNumber").toInt() == NET::OnAllDesktops) {
m_rules["desktops"]->setSuggestedValue(QStringList());
} else {
for (const auto vd : qAsConst(m_virtualDesktops)) {
if (info.value("x11DesktopNumber").toUInt() == vd.position + 1) {
m_rules["desktops"]->setSuggestedValue(QStringList{ vd.id });
break;
}
}
}
#ifdef KWIN_BUILD_ACTIVITIES
const QStringList activities = info.value("activities").toStringList();
m_rules["activity"]->setSuggestedValue(activities.isEmpty() ? QStringList{ Activities::nullUuid() }