From c1da6bd1d0264866a001501d958d6728a1910a78 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Jul 2019 08:49:47 +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" --- kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindecoration/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 93695dcab3..73ed6c10d9 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -76,6 +76,7 @@ Comment=Configure window titlebars and borders Comment[ca]=Configura la barra de títol i les vores de les finestres Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres Comment[da]=Indstil vinduets titellinjer og kanter +Comment[de]=Titelleiste und Ränder von Fenstern einrichten Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop index 3bcc0d3010..5b4c31b1b4 100644 --- a/kcmkwin/kwindecoration/package/metadata.desktop +++ b/kcmkwin/kwindecoration/package/metadata.desktop @@ -78,6 +78,7 @@ Comment=Configure window titlebars and borders Comment[ca]=Configura la barra de títol i les vores de les finestres Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres Comment[da]=Indstil vinduets titellinjer og kanter +Comment[de]=Titelleiste und Ränder von Fenstern einrichten Comment[en_GB]=Configure window titlebars and borders Comment[es]=Configurar barra de título y bordes de las ventanas Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak From d72e2bfc557c6a865efb417a657c3134b55fab9d Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 20 Jul 2019 15:13:58 +0200 Subject: [PATCH 2/2] Fix Qt warnings when rect is invalid, e.g. QRect(0,2111 3840x0) Summary: kwin(28512) QPainter::begin|QPainter::QPainter|KWin::Decoration::Renderer::renderToImage QPainter::begin: Paint device returned engine == 0, type: 3 kwin(28512) QPainter::setRenderHints|QPainter::setRenderHint|KWin::Decoration::Renderer::renderToImage QPainter::setRenderHint: Painter must be active to set rendering hints kwin(28512) QPainter::setWindow|KWin::Decoration::Renderer::renderToImage|?KWinX11Platform.so? QPainter::setWindow: Painter not active kwin(28512) QPainter::setClipRect|KWin::Decoration::Renderer::renderToImage|?KWinX11Platform.so? QPainter::setClipRect: Painter not active Test Plan: seems to happen on startup, at least (when restarting kwin) Reviewers: graesslin, zzag Reviewed By: zzag Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D9014 --- plugins/platforms/x11/standalone/x11_decoration_renderer.cpp | 2 +- plugins/scenes/opengl/scene_opengl.cpp | 2 +- plugins/scenes/xrender/scene_xrender.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/platforms/x11/standalone/x11_decoration_renderer.cpp b/plugins/platforms/x11/standalone/x11_decoration_renderer.cpp index d8b49544a6..f3550c5b8d 100644 --- a/plugins/platforms/x11/standalone/x11_decoration_renderer.cpp +++ b/plugins/platforms/x11/standalone/x11_decoration_renderer.cpp @@ -88,7 +88,7 @@ void X11Renderer::render() bottom = bottom.intersected(geometry); auto renderPart = [this, c](const QRect &geo) { - if (geo.isNull()) { + if (!geo.isValid()) { return; } QImage image = renderToImage(geo); diff --git a/plugins/scenes/opengl/scene_opengl.cpp b/plugins/scenes/opengl/scene_opengl.cpp index 8da2d358df..0a9103eda2 100644 --- a/plugins/scenes/opengl/scene_opengl.cpp +++ b/plugins/scenes/opengl/scene_opengl.cpp @@ -2490,7 +2490,7 @@ void SceneOpenGLDecorationRenderer::render() const QRect geometry = dirty ? QRect(QPoint(0, 0), client()->client()->geometry().size()) : scheduled.boundingRect(); auto renderPart = [this](const QRect &geo, const QRect &partRect, const QPoint &offset, bool rotated = false) { - if (geo.isNull()) { + if (!geo.isValid()) { return; } QImage image = renderToImage(geo); diff --git a/plugins/scenes/xrender/scene_xrender.cpp b/plugins/scenes/xrender/scene_xrender.cpp index 30911f15a1..b5e6f904b5 100644 --- a/plugins/scenes/xrender/scene_xrender.cpp +++ b/plugins/scenes/xrender/scene_xrender.cpp @@ -1226,7 +1226,7 @@ void SceneXRenderDecorationRenderer::render() xcb_create_gc(c, m_gc, m_pixmaps[int(DecorationPart::Top)], 0, nullptr); } auto renderPart = [this, c](const QRect &geo, const QPoint &offset, int index) { - if (geo.isNull()) { + if (!geo.isValid()) { return; } QImage image = renderToImage(geo);