From 5eafca5efbc29d86dac0e643e99017d8355b4e31 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Tue, 14 May 2013 09:45:53 +0200 Subject: Respect specified minimum height for menuBar also if it has HFW. If the menu bar is subject to height for width (HFW) we should of course respect that, but in addition we should ensure that the HFW is within the minimum and maximum height. This also is consistent with how QGridLayout calculates the effective minimum row height. This fixes a regression because change 4780f94e391b5e881497c5228661dead turned QTabWidget into a proper height-for-width citizen, and when setting a QTabWidget as a menuwidget, the buggy codepath for HFW was suddenly hit in menuBarHeightForWidth(). Task-number: QTBUG-31057 Reviewed-by: Paul Olav Tvete (cherry picked from qtbase/27e690e163408dec1e9c56ffc07131354d4b2c8a) Change-Id: I915d37c69152c1804925000303e82a3fae5a9a47 Reviewed-by: Paul Olav Tvete --- src/gui/kernel/qlayout.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp index ce8322b..9aca81e 100644 --- a/src/gui/kernel/qlayout.cpp +++ b/src/gui/kernel/qlayout.cpp @@ -59,12 +59,10 @@ static int menuBarHeightForWidth(QWidget *menubar, int w) { if (menubar && !menubar->isHidden() && !menubar->isWindow()) { int result = menubar->heightForWidth(qMax(w, menubar->minimumWidth())); - if (result != -1) - return result; - result = menubar->sizeHint() - .expandedTo(menubar->minimumSize()) - .expandedTo(menubar->minimumSizeHint()) - .boundedTo(menubar->maximumSize()).height(); + if (result == -1) + result = menubar->sizeHint().height(); + const int min = qSmartMinSize(menubar).height(); + result = qBound(min, result, menubar->maximumSize().height()); if (result != -1) return result; } -- cgit v0.12