From e0e4a3f2c0f41d118dfba22ea04580d94a082863 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Mon, 16 Aug 2021 16:57:57 +0200
Subject: [PATCH 1/2] Add shadow behind the what's new pages

As discussed during the eCCB.
---
 resources/qml/WelcomePages/WhatsNewContent.qml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml
index 65989ee536..f5ce72997f 100644
--- a/resources/qml/WelcomePages/WhatsNewContent.qml
+++ b/resources/qml/WelcomePages/WhatsNewContent.qml
@@ -4,6 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
+import QtGraphicalEffects 1.12 // For the DropShadow
 
 import UM 1.3 as UM
 import Cura 1.1 as Cura
@@ -91,6 +92,13 @@ Item
                         source: manager.getSubpageImageSource(index)
                     }
 
+                    DropShadow {
+                        anchors.fill: subpageImage
+                        radius: UM.Theme.getSize("monitor_shadow_radius").width
+                        color: UM.Theme.getColor("first_run_shadow")
+                        source: subpageImage
+                    }
+
                     Cura.ScrollableTextArea
                     {
                         id: subpageText

From 33edc4a8c90c03a681b2b0eb3c495d257c9a9c42 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Tue, 17 Aug 2021 13:34:43 +0200
Subject: [PATCH 2/2] Fix display of unlinking button

It was not being displayed with Qt 5.15 due to the following error:
MaterialsView.qml:34:5: Unable to assign QStringList to QString
This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button.

Fixes #10235.
---
 resources/qml/Preferences/Materials/MaterialsView.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 489ff1f33e..2c68973e55 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -39,14 +39,14 @@ TabView
         }
         if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode)
         {
-            return ""
+            return "";
         }
         var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.currentMaterialNode, true);
         if (linkedMaterials.length == 0)
         {
-            return ""
+            return "";
         }
-        return linkedMaterials;
+        return linkedMaterials.join(", ");
     }
 
     function getApproximateDiameter(diameter)