From 6a676d6fab6498f9aad2d17dc9c8d5d4244ad276 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Sep 2017 06:53:13 +0200 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/scenes/qpainter/qpainter.json | 3 ++- plugins/scenes/xrender/xrender.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index f755cc785b..ebd67e1ea0 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -6,6 +6,7 @@ "Description[ca]": "Connector del Compositor del KWin que renderitza a través del QPainter", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω QPainter", "Description[es]": "Complemento compositor de KWin renderizando mediante QPainter", + "Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter", "Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter", "Description[nl]": "KWin-compositor-plug-in rendering via QPainter", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez QPainter", @@ -17,7 +18,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", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 64569cdd1f..af41468555 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -6,6 +6,7 @@ "Description[ca]": "Connector del Compositor del KWin que renderitza a través de l'XRender", "Description[el]": "Αποτύπωση πρσοθέτου συνθέτη KWin μέσω XRender", "Description[es]": "Complemento compositor de KWin renderizando mediante XRender", + "Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender", "Description[it]": "Estensione del compositore di KWin per la resa tramite XRender", "Description[nl]": "KWin-compositor-plug-in rendering via XRender", "Description[pl]": "Wtyczka kompozytora KWin wyświetlająca przez XRender", @@ -17,7 +18,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", From 4238218b762996b41480f8d1c9a1c88930e08a11 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 18 Sep 2017 16:40:21 +0100 Subject: [PATCH 2/2] Don't scale cursor hotspot differently to cursor Summary: In the DRM plugin the cursor is currently is drawn at the native size given. Therefore we don't want to scale the icon offset as that leads to it being drawn every so slightly off-sync. BUG: 384769 Fixed-in: 5.11.0 Test Plan: Kate now selects lines based on the middle of the cursor, not the top left. I'd previously gotten so used to it, I hadn't realised it was actually a bug :/ Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: plasma-devel, kwin, #kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D7868 --- plugins/platforms/drm/drm_backend.cpp | 3 +-- plugins/platforms/drm/drm_output.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/platforms/drm/drm_backend.cpp b/plugins/platforms/drm/drm_backend.cpp index 30141ab6ef..33f894d414 100644 --- a/plugins/platforms/drm/drm_backend.cpp +++ b/plugins/platforms/drm/drm_backend.cpp @@ -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()); } } diff --git a/plugins/platforms/drm/drm_output.cpp b/plugins/platforms/drm/drm_output.cpp index e32c0b387f..bdd4506164 100644 --- a/plugins/platforms/drm/drm_output.cpp +++ b/plugins/platforms/drm/drm_output.cpp @@ -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()); }