From 780e203bceac21bef98131e79ddba0b0346de49f Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 19 Dec 2021 14:10:44 +0200
Subject: [PATCH] fixes for config windows

---
 app/view/settings/canvasconfigview.cpp    |  7 +------
 app/view/settings/primaryconfigview.cpp   | 16 +++++-----------
 app/view/settings/secondaryconfigview.cpp |  7 +------
 app/view/settings/subconfigview.cpp       |  2 +-
 app/wm/waylandinterface.cpp               | 11 +++++++++--
 5 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/app/view/settings/canvasconfigview.cpp b/app/view/settings/canvasconfigview.cpp
index 7658999c2..cbd3a8a1d 100644
--- a/app/view/settings/canvasconfigview.cpp
+++ b/app/view/settings/canvasconfigview.cpp
@@ -179,12 +179,7 @@ void CanvasConfigView::focusOutEvent(QFocusEvent *ev)
 
 void CanvasConfigView::hideConfigWindow()
 {
-    if (KWindowSystem::isPlatformWayland()) {
-        //!NOTE: Avoid crash in wayland environment with qt5.9
-        close();
-    } else {
-        hide();
-    }
+    hide();
 }
 
 //!BEGIN borders
diff --git a/app/view/settings/primaryconfigview.cpp b/app/view/settings/primaryconfigview.cpp
index 2096c1d63..98305b053 100644
--- a/app/view/settings/primaryconfigview.cpp
+++ b/app/view/settings/primaryconfigview.cpp
@@ -109,7 +109,7 @@ void PrimaryConfigView::init()
 
     auto source = QUrl::fromLocalFile(m_latteView->containment()->corona()->kPackage().filePath(tempFilePath));
     setSource(source);
-    //syncGeometry();
+    syncGeometry();
 }
 
 Config::IndicatorUiManager *PrimaryConfigView::indicatorUiManager()
@@ -164,13 +164,7 @@ void PrimaryConfigView::showConfigWindow()
 
 void PrimaryConfigView::hideConfigWindow()
 {
-    if (KWindowSystem::isPlatformWayland()) {
-        //!NOTE: Avoid crash in wayland environment with qt5.9
-        close();
-    } else {
-        hide();
-    }
-
+    hide();
     hideCanvasWindow();
     hideSecondaryWindow();
 }
@@ -402,13 +396,13 @@ void PrimaryConfigView::syncGeometry()
 
     m_geometryWhenVisible = geometry;
 
+    qDebug() << "org.kde.layer ::: SETTING PRIMARY CONFIG WINDOW :::: " << m_geometryWhenVisible << " avail geometry :: " << m_availableScreenGeometry;
+    m_corona->wm()->setWindowPosition(this, m_latteView->location(), m_geometryWhenVisible);
+
     setMaximumSize(geometry.size());
     setMinimumSize(geometry.size());
     resize(geometry.size());
 
-    qDebug() << "org.kde.layer ::: SETTING PRIMARY CONFIG WINDOW :::: " << m_geometryWhenVisible << " avail geometry :: " << m_availableScreenGeometry;
-    m_corona->wm()->setWindowPosition(this, m_latteView->location(), m_geometryWhenVisible);
-
     emit m_latteView->configWindowGeometryChanged();
 }
 
diff --git a/app/view/settings/secondaryconfigview.cpp b/app/view/settings/secondaryconfigview.cpp
index 931b20a56..fdae605a2 100644
--- a/app/view/settings/secondaryconfigview.cpp
+++ b/app/view/settings/secondaryconfigview.cpp
@@ -203,12 +203,7 @@ void SecondaryConfigView::focusOutEvent(QFocusEvent *ev)
 
 void SecondaryConfigView::hideConfigWindow()
 {
-    if (KWindowSystem::isPlatformWayland()) {
-        //!NOTE: Avoid crash in wayland environment with qt5.9
-        close();
-    } else {
-        hide();
-    }
+    hide();
 }
 
 void SecondaryConfigView::updateEffects()
diff --git a/app/view/settings/subconfigview.cpp b/app/view/settings/subconfigview.cpp
index 52db0d854..fd0364795 100644
--- a/app/view/settings/subconfigview.cpp
+++ b/app/view/settings/subconfigview.cpp
@@ -75,7 +75,7 @@ SubConfigView::SubConfigView(Latte::View *view, const QString &title, const bool
 
     connections << connect(&m_showTimer, &QTimer::timeout, this, [this]() {
         syncSlideEffect();
-       // show();
+        show();
     });
 }
 
diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp
index accd0f5ec..eca42ba56 100644
--- a/app/wm/waylandinterface.cpp
+++ b/app/wm/waylandinterface.cpp
@@ -503,7 +503,12 @@ void WaylandInterface::setWindowPosition(QWindow *window, const Plasma::Types::L
     QMargins margins;
     LayerShellQt::Window::Anchors anchors = 0;
 
-    if (location == Plasma::Types::TopEdge || location == Plasma::Types::LeftEdge) {
+    anchors = LayerShellQt::Window::AnchorTop;
+    anchors = anchors | LayerShellQt::Window::AnchorLeft;
+    margins.setTop(geometry.top() - window->screen()->geometry().top());
+    margins.setLeft(geometry.left() - window->screen()->geometry().left());
+
+    /*if (location == Plasma::Types::TopEdge || location == Plasma::Types::LeftEdge) {
         anchors = LayerShellQt::Window::AnchorTop;
         anchors = anchors | LayerShellQt::Window::AnchorLeft;
         margins.setTop(geometry.top() - window->screen()->geometry().top());
@@ -519,7 +524,9 @@ void WaylandInterface::setWindowPosition(QWindow *window, const Plasma::Types::L
         anchors = anchors | LayerShellQt::Window::AnchorLeft;
         margins.setBottom(window->screen()->geometry().bottom() - geometry.bottom());
         margins.setLeft(geometry.left() - window->screen()->geometry().left());
-    }
+        //! when window changes height the kwin wm is not taking into account the anchoring.
+        //! Such an example is when PrimaryConfigView changes from normal to advanced mode and back
+    }*/
 
     layerWindow->setAnchors(anchors);
     layerWindow->setMargins(margins);