ADS: Integrate newest base repository commits

998fe9fa11939eb28dd021ca11d5302c4fe2a005
28dc374fc25fcf5a4100c7ad929cb8da690530ed
0e88467f94194d5bea209f6ddc364358ab92899e
d0f4ce324890197683869eafda0f3938ae619b8d
c541f2c69b519eceb76ffc54589175c9fd0da8a6
37d305e50d2c0829f031b71a61e290361eea9f07

- Fix/workaround for escape key issue with remaining overlays
- Clean up if statements according to style guide

Task-number: QDS-1883
Change-Id: I44ddaed67458a75aca91bdd74cd2b5890bd23c38
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/libs/advanceddockingsystem/dockwidget.cpp

@@ -83,6 +83,7 @@ namespace ADS
         QSize m_toolBarIconSizeFloating = QSize(24, 24);
         bool m_isFloatingTopLevel = false;
         QList<QAction *> m_titleBarActions;
+        DockWidget::eMinimumSizeHintMode m_minimumSizeHintMode = DockWidget::MinimumSizeHintFromDockWidget;
 
         /**
          * Private data constructor
@@ -317,6 +318,11 @@ namespace ADS
         }
     }
 
+    void DockWidget::setMinimumSizeHintMode(eMinimumSizeHintMode mode)
+    {
+        d->m_minimumSizeHintMode = mode;
+    }
+
     void DockWidget::toggleView(bool open)
     {
         // If the toggle view action mode is ActionModeShow, then Open is always
@@ -545,7 +551,13 @@ namespace ADS
 
     void DockWidget::setClosedState(bool closed) { d->m_closed = closed; }
 
-    QSize DockWidget::minimumSizeHint() const { return QSize(60, 40); }
+    QSize DockWidget::minimumSizeHint() const
+    {
+        if (d->m_minimumSizeHintMode == DockWidget::MinimumSizeHintFromDockWidget || !d->m_widget)
+            return QSize(60, 40);
+        else
+            return d->m_widget->minimumSizeHint();
+    }
 
     void DockWidget::setFloating()
     {
@@ -587,6 +599,7 @@ namespace ADS
                     floatingWidget->hide();
             }
             deleteDockWidget();
+            emit closed();
         } else {
             toggleView(false);
         }