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

Merge branch 'Plasma/5.11'

Browse source
This commit is contained in:
David Edmundson 2017-09-18 16:40:57 +01:00
commit d59f5997fd
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/platforms/drm/drm_backend.cpp
View file

@ -678,12 +678,11 @@ void DrmBackend::doHideCursor()
void DrmBackend::moveCursor()
{
const QPoint p = Cursor::pos() - softwareCursorHotspot();
if (!m_cursorEnabled || isCursorHidden()) {
return;
}
for (auto it = m_outputs.constBegin(); it != m_outputs.constEnd(); ++it) {
(*it)->moveCursor(p);
(*it)->moveCursor(Cursor::pos());
}
}

2
plugins/platforms/drm/drm_output.cpp
View file

@ -104,7 +104,7 @@ void DrmOutput::showCursor(DrmDumbBuffer *c)
void DrmOutput::moveCursor(const QPoint &globalPos)
{
const QPoint p = (globalPos - m_globalPos) * m_scale;
const QPoint p = (globalPos * m_scale) - m_backend->softwareCursorHotspot();
drmModeMoveCursor(m_backend->fd(), m_crtc->id(), p.x(), p.y());
}

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

@ -19,7 +19,7 @@
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter",
"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

@ -19,7 +19,7 @@
"Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender",
"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",