Fixed QLayout to take the maxi/min size into account for the menu bar

It was only taking the sizeHint into account

Task-number: 141355
Reviewed-by: jasplin

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp
index 3a3feb2..e750088 100644
--- a/src/gui/kernel/qlayout.cpp
+++ b/src/gui/kernel/qlayout.cpp
@@ -61,7 +61,10 @@ static int menuBarHeightForWidth(QWidget *menubar, int w)
         int result = menubar->heightForWidth(qMax(w, menubar->minimumWidth()));
         if (result != -1)
             return result;
-        result = menubar->sizeHint().height();
+        result = menubar->sizeHint()
+            .expandedTo(menubar->minimumSize())
+            .expandedTo(menubar->minimumSizeHint())
+            .boundedTo(menubar->maximumSize()).height();
         if (result != -1)
             return result;
     }