From 6a093b93436ba5507e5dd1f223d5c32c8ad17739 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 19 Jun 2019 13:24:53 +0200
Subject: [PATCH] respecting minimum/maximum sizes

---
 src/controls/QskWindow.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp
index 2249ca04..ffae444f 100644
--- a/src/controls/QskWindow.cpp
+++ b/src/controls/QskWindow.cpp
@@ -74,7 +74,7 @@ namespace
         }
 
       private:
-        QQuickItem* m_contentItem;
+        QQuickItem* m_contentItem = nullptr;
     };
 }
 
@@ -244,9 +244,14 @@ bool QskWindow::event( QEvent* event )
         {
             if ( size().isEmpty() )
             {
-                const QSize sz = effectivePreferredSize();
+                QSize sz = effectivePreferredSize();
                 if ( !sz.isEmpty() )
+                {
+                    sz = sz.expandedTo( minimumSize() );
+                    sz = sz.boundedTo( maximumSize() );
+
                     resize( sz );
+                }
             }
 
             break;
@@ -415,6 +420,7 @@ QSize QskWindow::effectivePreferredSize() const
             if ( auto control = qskControlCast( child ) )
             {
                 const QSizeF itemConstraint = control->sizeHint();
+
                 if ( doWidth )
                     constraint.setWidth( qMax( constraint.width(), itemConstraint.width() ) );