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

Broadcast application menu to resources when registering them

Browse source 
Summary:
Previously, KWayland wasn't hanging onto the application menu
to broadcast it when registering a resource. This fixes that.

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: kde-frameworks-devel, zzag

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D28168
This commit is contained in:
Carson Black 2020-03-20 14:40:56 -04:00
parent 53a0c4faec
commit 148888b569
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wayland/plasmawindowmanagement_interface.cpp
View file

@ -105,6 +105,8 @@ private:
QString m_appId;
quint32 m_pid = 0;
QString m_themedIconName;
QString m_appServiceName;
QString m_appObjectPath;
QIcon m_icon;
quint32 m_virtualDesktop = 0;
quint32 m_state = 0;
@ -357,6 +359,9 @@ void PlasmaWindowInterface::Private::createResource(wl_resource *parent, uint32_
if (!m_title.isEmpty()) {
org_kde_plasma_window_send_title_changed(resource, m_title.toUtf8().constData());
}
if (!m_appObjectPath.isEmpty() || !m_appServiceName.isEmpty()) {
org_kde_plasma_window_send_application_menu(resource, m_appServiceName.toUtf8().constData(), m_appObjectPath.toUtf8().constData());
}
org_kde_plasma_window_send_state_changed(resource, m_state);
if (!m_themedIconName.isEmpty()) {
org_kde_plasma_window_send_themed_icon_name_changed(resource, m_themedIconName.toUtf8().constData());
@ -577,6 +582,11 @@ void PlasmaWindowInterface::Private::setGeometry(const QRect &geo)
void PlasmaWindowInterface::Private::setApplicationMenuPaths(const QString &service, const QString &object)
{
if (m_appServiceName == service && m_appObjectPath == object) {
return;
}
m_appServiceName = service;
m_appObjectPath = object;
for (auto it = resources.constBegin(); it != resources.constEnd(); ++it) {
auto resource = *it;
if (wl_resource_get_version(resource) < ORG_KDE_PLASMA_WINDOW_APPLICATION_MENU_SINCE_VERSION) {