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

Merge branch 'Plasma/5.12'

Browse source
This commit is contained in:
Martin Flöser 2018-01-23 16:59:06 +01:00
commit 86f835ac35
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/scenes/qpainter/qpainter.json
View file

@ -27,7 +27,7 @@
"Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
"Id": "KWinSceneQPainter",
"Name": "SceneQPainter",
"Name[pl]": "QPainter sceny",

2
plugins/scenes/xrender/xrender.json
View file

@ -27,7 +27,7 @@
"Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
"Id": "KWinSceneXRender",
"Name": "SceneXRender",
"Name[pl]": "XRender sceny",

2
shell_client.cpp
View file

@ -1547,8 +1547,6 @@ void ShellClient::installServerSideDecoration(KWayland::Server::ServerSideDecora
connect(m_serverDecoration, &ServerSideDecorationInterface::modeRequested, this,
[this] (ServerSideDecorationManagerInterface::Mode mode) {
const bool changed = mode != m_serverDecoration->mode();
// always acknowledge the requested mode
m_serverDecoration->setMode(mode);
if (changed && !m_unmapped) {
updateDecoration(false);
}

6
wayland_server.cpp
View file

@ -337,6 +337,12 @@ bool WaylandServer::init(const QByteArray &socketName, InitalizationFlags flags)
if (ShellClient *c = findClient(deco->surface())) {
c->installServerSideDecoration(deco);
}
connect(deco, &ServerSideDecorationInterface::modeRequested, this,
[this, deco] (ServerSideDecorationManagerInterface::Mode mode) {
// always acknowledge the requested mode
deco->setMode(mode);
}
);
}
);
m_decorationManager->create();