From 67811e152a67c2e518c47e2267e0ec8973a6c7ac Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Mon, 16 Sep 2019 08:55:09 +0200
Subject: [PATCH] [Dialog] Apply window type after changing flags

Changing flags might override the window type, ensure we set it back properly

Differential Revision: https://phabricator.kde.org/D22569
---
 src/plasmaquick/dialog.cpp | 60 +++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index 47c05f2f4..74134ee7c 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -139,6 +139,7 @@ public:
 
     void setupWaylandIntegration();
 
+    void applyType();
 
     Dialog *q;
     Plasma::Types::Location location;
@@ -721,6 +722,36 @@ void DialogPrivate::setupWaylandIntegration()
 #endif
 }
 
+void DialogPrivate::applyType()
+{
+    if (type != Dialog::Normal) {
+        KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
+    } else {
+        q->setFlags(Qt::FramelessWindowHint | q->flags());
+    }
+    //an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
+    //see bug 370433
+    if (type == Dialog::OnScreenDisplay) {
+        q->setFlags((q->flags() & ~Qt::Dialog) | Qt::Window);
+    }
+
+    if (backgroundHints == Dialog::NoBackground) {
+        frameSvgItem->setImagePath(QString());
+    } else {
+        if (type == Dialog::Tooltip) {
+            frameSvgItem->setImagePath(QStringLiteral("widgets/tooltip"));
+        } else {
+            frameSvgItem->setImagePath(QStringLiteral("dialogs/background"));
+        }
+    }
+
+    if (type == Dialog::Dock || type == Dialog::Notification || type == Dialog::OnScreenDisplay || type == Dialog::CriticalNotification) {
+        KWindowSystem::setOnAllDesktops(q->winId(), true);
+    } else {
+        KWindowSystem::setOnAllDesktops(q->winId(), false);
+    }
+}
+
 
 Dialog::Dialog(QQuickItem *parent)
     : QQuickWindow(parent ? parent->window() : nullptr),
@@ -1021,6 +1052,7 @@ QObject *Dialog::margins() const
 void Dialog::setFramelessFlags(Qt::WindowFlags flags)
 {
     setFlags(Qt::FramelessWindowHint | flags);
+    d->applyType();
     emit flagsChanged();
 }
 
@@ -1070,33 +1102,7 @@ void Dialog::setType(WindowType type)
     }
 
     d->type = type;
-    if (d->type != Normal) {
-        KWindowSystem::setType(winId(), (NET::WindowType)type);
-    } else {
-        setFlags(Qt::FramelessWindowHint | flags());
-    }
-    //an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
-    //see bug 370433
-    if (type == OnScreenDisplay) {
-        setFlags((flags() & ~Qt::Dialog) | Qt::Window);
-    }
-
-    if (d->backgroundHints == Dialog::NoBackground) {
-        d->frameSvgItem->setImagePath(QString());
-    } else {
-        if (d->type == Tooltip) {
-            d->frameSvgItem->setImagePath(QStringLiteral("widgets/tooltip"));
-        } else {
-            d->frameSvgItem->setImagePath(QStringLiteral("dialogs/background"));
-        }
-    }
-
-    if (type == Dock || type == Notification || type == OnScreenDisplay || type == CriticalNotification) {
-        KWindowSystem::setOnAllDesktops(winId(), true);
-    } else {
-        KWindowSystem::setOnAllDesktops(winId(), false);
-    }
-
+    d->applyType();
     emit typeChanged();
 }