From 655b0876f1076b27140477fb1068f040ac2b0759 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 17 Oct 2017 08:26:28 +0100 Subject: [PATCH 1/4] Update version number for 5.11.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b739a2f489..72696b1b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.11.0") +set(PROJECT_VERSION "5.11.1") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.7.0") From 530e63b751075d70d279bad50820655da2d27cb0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Oct 2017 06:46:04 +0200 Subject: [PATCH 2/4] 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 | 1 + plugins/scenes/xrender/xrender.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index f476438dce..93c39e0d5e 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -17,6 +17,7 @@ "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz QPainter", "Description[sr]": "К‑винов прикључак слагача за рендеровање кроз QPainter", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via QPainter", + "Description[tr]": "QPainter üzerinden KWin Compositor eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 0cac76500b..81e221a38f 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -17,6 +17,7 @@ "Description[sr@latin]": "KWinov priključak slagača za renderovanje kroz XRender", "Description[sr]": "К‑винов прикључак слагача за рендеровање кроз Икс‑рендер", "Description[sv]": "Kwin sammansättningsinsticksprogram återger via XRender", + "Description[tr]": "XRender üzerinden KWin Compositor eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件", From aa58243a489a25b5e4fb2578927239e2ede39f6b Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 24 Oct 2017 11:12:42 +0100 Subject: [PATCH 3/4] Update version number for 5.11.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72696b1b4e..b235feb419 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.11.1") +set(PROJECT_VERSION "5.11.2") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.7.0") From 5d7e22e5dcf8981f9ba65088b81c1c6d456efef3 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 25 Oct 2017 18:03:22 +0100 Subject: [PATCH 4/4] Fix viewport on vertically stacked monitors Summary: We want to translate by the monitor position, so that needs to be the negative of the position. But Kwin/KScreen treats 0 as the top of all monitors. GL treats 0 as bottom, so that all needs inverting. Hence this should be a positive y value for the viewport. BUG: 386099 BUG: 385655 Test Plan: Had two monitors Side by side was - fine Stacked vertically - still fine Modded X code to extend in y instead of x. 3 monitors worked fine. Nested wayland only seems to support one screen? Reviewers: #plasma Subscribers: plasma-devel, kwin, #kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D8479 --- plugins/platforms/drm/egl_gbm_backend.cpp | 2 +- plugins/platforms/x11/windowed/egl_x11_backend.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/platforms/drm/egl_gbm_backend.cpp b/plugins/platforms/drm/egl_gbm_backend.cpp index 7083ecfab2..e25ff47d6a 100644 --- a/plugins/platforms/drm/egl_gbm_backend.cpp +++ b/plugins/platforms/drm/egl_gbm_backend.cpp @@ -194,7 +194,7 @@ bool EglGbmBackend::makeContextCurrent(const Output &output) qreal scale = output.output->scale(); - glViewport(-v.x() * scale, (v.height() - overall.height() - v.y()) * scale, + glViewport(-v.x() * scale, (v.height() - overall.height() + v.y()) * scale, overall.width() * scale, overall.height() * scale); return true; } diff --git a/plugins/platforms/x11/windowed/egl_x11_backend.cpp b/plugins/platforms/x11/windowed/egl_x11_backend.cpp index d0e08525f5..c9e649a712 100644 --- a/plugins/platforms/x11/windowed/egl_x11_backend.cpp +++ b/plugins/platforms/x11/windowed/egl_x11_backend.cpp @@ -108,7 +108,7 @@ void EglX11Backend::setupViewport(int screenId) // TODO: are the values correct? qreal scale = screens()->scale(screenId); - glViewport(-v.x(), v.height() - overall.height() - v.y(), overall.width() * scale, overall.height() * scale); + glViewport(-v.x(), v.height() - overall.height() + v.y(), overall.width() * scale, overall.height() * scale); } void EglX11Backend::endRenderingFrameForScreen(int screenId, const QRegion &renderedRegion, const QRegion &damagedRegion)