From e0df390dbc241409532c26a632490d03e19fb3da Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 21 Jan 2020 18:41:59 +0000
Subject: [PATCH 1/2] [kcms/kwindecoration] Fix saving of window decoration
 plugin

Summary:
In the KCFG autogenerated code we check for HAVE_BREEZE_DECO without
including the relevant file. This always fails, and so we save the
default plugin name/library as org.kde.kwin.aurorae

This doesn't match kwin's concept of the default and so we just fail to
load it.

BUG: 416525

Test Plan:
Reproduced
Saved a config

Reviewers: #kwin, ngraham

Reviewed By: ngraham

Subscribers: ngraham, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D26814
---
 kcmkwin/kwindecoration/kwindecorationsettings.kcfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcmkwin/kwindecoration/kwindecorationsettings.kcfg b/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
index 496cecf853..b13b7d7067 100644
--- a/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
+++ b/kcmkwin/kwindecoration/kwindecorationsettings.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>config-kwin.h</include>
   <kcfgfile name="kwinrc" />
   <group name="org.kde.kdecoration2">
     <entry name="pluginName" key="library" type="String">

From 7b910c51b173a49653f262fb191d49eb0073318b Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Tue, 21 Jan 2020 18:40:41 +0200
Subject: [PATCH 2/2] [effects/morphingpopups] Don't animate popups when only
 shape changes

Summary:
The frame geometry stays still when only shape changes.

BUG: 416531

Reviewers: #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D26809
---
 .../morphingpopups/package/contents/code/morphingpopups.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/effects/morphingpopups/package/contents/code/morphingpopups.js b/effects/morphingpopups/package/contents/code/morphingpopups.js
index 838964f6e2..98c167d666 100644
--- a/effects/morphingpopups/package/contents/code/morphingpopups.js
+++ b/effects/morphingpopups/package/contents/code/morphingpopups.js
@@ -38,6 +38,13 @@ var morphingEffect = {
         //don't cross the whole screen: ugly
         var distance = Math.abs(oldGeometry.x - newGeometry.x) + Math.abs(oldGeometry.y - newGeometry.y);
 
+        if (newGeometry.x == oldGeometry.x &&
+                newGeometry.y == oldGeometry.y &&
+                newGeometry.width == oldGeometry.width &&
+                newGeometry.height == oldGeometry.height) {
+            return;
+        }
+
         if (distance > (newGeometry.width + newGeometry.height) * 2) {
             if (window.moveAnimation) {
                 delete window.moveAnimation;