From fe8537c618ba4c675751547ccab507947f25132d Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Sun, 26 Mar 2023 11:48:37 -0700
Subject: [PATCH] kwin/convergentwindows: Update to latest KWin changes, and
 remove KWin maximize mode Disabled per-screen window decorations for now,
 since it seems KWin removed the screen property:
 https://invent.kde.org/plasma/kwin/-/commit/83c38b0907214a4146107f3f2672da6d7b04c151

---
 components/mobileshellstate/README.md               | 10 ----------
 kded/config.h                                       |  1 -
 kwin/scripts/convergentwindows/contents/ui/main.qml | 10 +++++-----
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 components/mobileshellstate/README.md

diff --git a/components/mobileshellstate/README.md b/components/mobileshellstate/README.md
deleted file mode 100644
index 3166de2e..00000000
--- a/components/mobileshellstate/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-- SPDX-FileCopyrightText: None
-- SPDX-License-Identifier: CC0-1.0
--->
-
-# MobileShell State Plugin
-
-This plugin stores the state of the mobile shell.
-
-It should ONLY be imported by components in the plasmashell process (otherwise it won't be able to get the state).
diff --git a/kded/config.h b/kded/config.h
index acbdba88..8378b1c1 100644
--- a/kded/config.h
+++ b/kded/config.h
@@ -13,7 +13,6 @@
 const QMap<QString, QMap<QString, QVariant>> KWINRC_SETTINGS = {
     {"Plugins", {{"blurEnabled", false}, {"convergentwindowsEnabled", true}}},
     {"Wayland", {{"InputMethod", "/usr/share/applications/com.github.maliit.keyboard.desktop"}, {"VirtualKeyboardEnabled", true}}},
-    {"Windows", {{"Placement", "Maximizing"}}},
 };
 
 // applications-blacklistrc
diff --git a/kwin/scripts/convergentwindows/contents/ui/main.qml b/kwin/scripts/convergentwindows/contents/ui/main.qml
index 6d9667ca..ecbefd9f 100644
--- a/kwin/scripts/convergentwindows/contents/ui/main.qml
+++ b/kwin/scripts/convergentwindows/contents/ui/main.qml
@@ -9,12 +9,12 @@ Item {
     id: root
 
     function run(client) {
-        if (client.screen === 0) {
+        // if (client.output === 0) {
             client.setMaximize(true, true);
             client.noBorder = true;
-        } else {
-            client.noBorder = false;
-        }
+        // } else {
+            // client.noBorder = false;
+        // }
     }
 
     Connections {
@@ -33,7 +33,7 @@ Item {
             // Windows are moved from the external screen
             // to the internal screen if the external screen
             // is disconnected.
-            const clients = Workspace.clientList();
+            const clients = Workspace.clients;
 
             for (var i = 0; i < clients.length; i++) {
                 if (clients[i].normalWindow) {