From 54e46dbd9f1075aeb124e5a188c3ec63bb5605b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Feb 2019 08:36:52 +0100 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/kwintabbox/kwintabbox.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 4af22ac32c..23348753b9 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -108,7 +108,7 @@ Comment[sr@ijekavianlatin]=Kretanje između prozora Comment[sr@latin]=Kretanje između prozora Comment[sv]=Navigering via fönster Comment[tr]=Pencereler Arası Gezinti -Comment[uk]=Навігація ввікнами +Comment[uk]=Навігація вікнами Comment[vi]=Điều hướng qua các cửa sổ Comment[x-test]=xxNavigation Through Windowsxx Comment[zh_CN]=遍历窗口 From bdddf4daf2d810630e1527798384188e001c80ce Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Thu, 7 Feb 2019 01:02:32 +0200 Subject: [PATCH 2/2] [effects/screenedge] Use correct blend function Summary: Glow textures already have the red, green, and blue channels premultiplied by the alpha component (because of QImage), thus we can't use GL_SRC_ALPHA for sfactor in glBlendFunc. BUG: 403570 Test Plan: Before: {F6592391} After: {F6592392} Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D18803 --- effects/screenedge/screenedgeeffect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/screenedge/screenedgeeffect.cpp b/effects/screenedge/screenedgeeffect.cpp index 1b8dea068c..ea72a7e959 100644 --- a/effects/screenedge/screenedgeeffect.cpp +++ b/effects/screenedge/screenedgeeffect.cpp @@ -102,7 +102,7 @@ void ScreenEdgeEffect::paintScreen(int mask, QRegion region, ScreenPaintData &da if (effects->isOpenGLCompositing()) { GLTexture *texture = (*it)->texture.data(); glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); texture->bind(); ShaderBinder binder(ShaderTrait::MapTexture | ShaderTrait::Modulate); const QVector4D constant(opacity, opacity, opacity, opacity);