From 14bc04aab76496be0856e00f9aab3e716559723c Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 10 Mar 2020 12:43:55 +0000 Subject: [PATCH 1/2] Update version number for 5.18.3 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1ee5eb8b4..60bcfb6873 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.18.2") +set(PROJECT_VERSION "5.18.3") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From 348e72c56ec7e157cec15d8e27065e4194490d89 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 19 Mar 2020 16:36:09 +0200 Subject: [PATCH 2/2] [scenes/opengl] Print a debug message when viewport limits aren't met Summary: This may help with debugging why compositing is suspended. CCBUG: 418951 Test Plan: Compiles. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D28139 --- plugins/scenes/opengl/scene_opengl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/scenes/opengl/scene_opengl.cpp b/plugins/scenes/opengl/scene_opengl.cpp index d15e503174..36e6499405 100644 --- a/plugins/scenes/opengl/scene_opengl.cpp +++ b/plugins/scenes/opengl/scene_opengl.cpp @@ -800,8 +800,9 @@ bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const { if (limit[0] < size.width() || limit[1] < size.height()) { auto compositor = static_cast(Compositor::self()); QMetaObject::invokeMethod(compositor, [compositor]() { - compositor->suspend(X11Compositor::AllReasonSuspend); - }, Qt::QueuedConnection); + qCDebug(KWIN_OPENGL) << "Suspending compositing because viewport limits are not met"; + compositor->suspend(X11Compositor::AllReasonSuspend); + }, Qt::QueuedConnection); return false; } return true;