From 47b65258b826b4404ad89b4ad79ce9583e83d3ab Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Thu, 29 Dec 2016 00:25:42 +0200
Subject: [PATCH] improve settings window behavior onlostfocus

-- and fix a crash from immutabilityChanged from
settings window
---
 app/nowdockconfigview.cpp | 44 ++++++++++++++++++++++++---------------
 app/nowdockconfigview.h   |  5 +++++
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/app/nowdockconfigview.cpp b/app/nowdockconfigview.cpp
index 885dcf4ff..d6811bb65 100644
--- a/app/nowdockconfigview.cpp
+++ b/app/nowdockconfigview.cpp
@@ -51,12 +51,12 @@ NowDockConfigView::NowDockConfigView(Plasma::Containment *containment, NowDockVi
         syncSlideEffect();
     });
     
-    //containment->setLocation(Plasma::Types::LeftEdge);
-    /*connect(containment, &Plasma::Containment::immutabilityChanged
-    , [&](Plasma::Types::ImmutabilityType type) {
-        if (type != Plasma::Types::Mutable && isVisible())
-            hide();
-    });*/
+    connect(containment, &Plasma::Containment::immutabilityChanged, this, &NowDockConfigView::immutabilityChanged);
+    /*   connect(containment, &Plasma::Containment::immutabilityChanged
+       , [&](Plasma::Types::ImmutabilityType type) {
+           if (type != Plasma::Types::Mutable && this && isVisible())
+               hide();
+       });*/
 }
 
 NowDockConfigView::~NowDockConfigView()
@@ -83,7 +83,7 @@ void NowDockConfigView::syncGeometry()
 {
     if (!m_containment || !rootObject())
         return;
-        
+
     const auto location = m_containment->location();
     const auto sGeometry = screen()->geometry();
     
@@ -93,7 +93,7 @@ void NowDockConfigView::syncGeometry()
             setMaximumSize(size);
             setMinimumSize(size);
             resize(size);
-            
+
             if (location == Plasma::Types::TopEdge) {
                 setPosition(sGeometry.center().x() - size.width() / 2
                             , m_dockView->currentThickness());
@@ -109,7 +109,7 @@ void NowDockConfigView::syncGeometry()
             setMaximumSize(size);
             setMinimumSize(size);
             resize(size);
-            
+
             if (location == Plasma::Types::LeftEdge) {
                 setPosition(m_dockView->currentThickness()
                             , sGeometry.center().y() - size.height() / 2);
@@ -131,26 +131,26 @@ void NowDockConfigView::syncSlideEffect()
 {
     if (!m_containment)
         return;
-        
+
     KWindowEffects::SlideFromLocation slideLocation{KWindowEffects::NoEdge};
     
     switch (m_containment->location()) {
         case Plasma::Types::TopEdge:
             slideLocation = KWindowEffects::TopEdge;
             break;
-            
+
         case Plasma::Types::RightEdge:
             slideLocation = KWindowEffects::RightEdge;
             break;
-            
+
         case Plasma::Types::BottomEdge:
             slideLocation = KWindowEffects::BottomEdge;
             break;
-            
+
         case Plasma::Types::LeftEdge:
             slideLocation = KWindowEffects::LeftEdge;
             break;
-            
+
         default:
             qDebug() << staticMetaObject.className() << "wrong location";// << qEnumToStr(m_containment->location());
             break;
@@ -172,7 +172,7 @@ void NowDockConfigView::showEvent(QShowEvent *ev)
     
     if (m_containment)
         m_containment->setUserConfiguring(true);
-        
+
     //  m_dockView->visibility()->forceShow(true);
     //  m_dockView->visibility()->showImmediately();
     m_screenSyncTimer.start();
@@ -196,12 +196,22 @@ void NowDockConfigView::hideEvent(QHideEvent *ev)
 
 void NowDockConfigView::focusOutEvent(QFocusEvent *ev)
 {
+    //FIXME: I can understand why we need to hide on focus out
     Q_UNUSED(ev);
     const auto *focusWindow = qGuiApp->focusWindow();
     
     if (focusWindow && focusWindow->flags().testFlag(Qt::Popup))
         return;
-        
-    hide();
+
+
+    // hide();
 }
+
+void NowDockConfigView::immutabilityChanged(Plasma::Types::ImmutabilityType type)
+{
+    if (type != Plasma::Types::Mutable && isVisible()) {
+        hide();
+    }
+}
+
 // kate: indent-mode cstyle; indent-width 4; replace-tabs on;
diff --git a/app/nowdockconfigview.h b/app/nowdockconfigview.h
index 772d6d563..a0ea591a2 100644
--- a/app/nowdockconfigview.h
+++ b/app/nowdockconfigview.h
@@ -21,6 +21,7 @@
 #define NOWDOCKCONFIGVIEW_H
 
 #include "plasmaquick/configview.h"
+#include <plasma/package.h>
 
 #include <QObject>
 #include <QWindow>
@@ -30,6 +31,7 @@
 namespace Plasma {
 class Applet;
 class Containment;
+class Types;
 }
 
 class NowDockView;
@@ -51,6 +53,9 @@ protected:
     
     void syncGeometry();
     void syncSlideEffect();
+
+private Q_SLOTS:
+    void immutabilityChanged(Plasma::Types::ImmutabilityType type);
     
 private:
     Plasma::Containment *m_containment{nullptr};