From 6375fb424fc2b908ccf43908313ec56863f0b427 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Sat, 4 Mar 2023 18:52:41 -0800
Subject: [PATCH] Fix shell layout.js

---
 shell/contents/layout.js         | 13 ++++++++-----
 shell/contents/views/Desktop.qml |  7 +++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/shell/contents/layout.js b/shell/contents/layout.js
index af873298..0515cbdd 100644
--- a/shell/contents/layout.js
+++ b/shell/contents/layout.js
@@ -8,18 +8,21 @@
 var desktopsArray = desktopsForActivity(currentActivity());
 for (var j = 0; j < desktopsArray.length; j++) {
     desktopsArray[j].wallpaperPlugin = "org.kde.image";
+
+    if (j == 0) {
+        // add meta shortcut
+        desktopsArray[0].currentConfigGroup = ["Shortcuts"]
+        desktopsArray[0].writeConfig("global", "Meta+F1")
+    }
 }
 
-// add meta shortcut 
-desktopsArray[0].currentConfigGroup = ["Shortcuts"]
-desktopsArray[0].writeConfig("global", "Meta+F1")
 
 // keep this list in sync with shell/contents/updates/panelsfix.js
-var panel = new Panel("org.kde.phone.panel");
+var panel = new Panel("org.kde.plasma.mobile.panel");
 panel.location = "top";
 panel.addWidget("org.kde.plasma.notifications");
 panel.height = 1.25 * gridUnit; // HACK: supposed to be gridUnit + smallSpacing, but it doesn't seem to give the correct number
 
-var bottomPanel = new Panel("org.kde.phone.taskpanel")
+var bottomPanel = new Panel("org.kde.desktopcontainment")
 bottomPanel.location = "bottom";
 bottomPanel.height = 2 * gridUnit;
diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 511e26f2..54d768fb 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -15,7 +15,6 @@ import org.kde.kirigami 2.20 as Kirigami
 Rectangle {
     id: root
 
-    visible: false //adjust borders is run during setup. We want to avoid painting till completed
     property Item containment
 
     color: (containment && containment.backgroundHints == PlasmaCore.Types.NoBackground) ? "transparent" : PlasmaCore.Theme.textColor
@@ -53,13 +52,17 @@ Rectangle {
     }
 
     onContainmentChanged: {
+        if (containment == null) {
+            return;
+        }
+
         containment.parent = root;
         containment.visible = true;
         containment.anchors.fill = root;
     }
 
     Component.onCompleted: {
-        visible = true
+        // desktop.windowType = Shell.Desktop.Desktop;
     }
     
     // This is taken from plasma-desktop's shell package, try to keep it in sync