AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect specified minimum height for menuBar also if it has HFW.

Browse Source 
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

Change-Id: I3c1bb8063c92d6eda7e9433e44f08967d8e1c43e
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
Jan Arve Saether 2013-05-14 09:45:53 +02:00 committed by The Qt Project
parent 0b862e0677
commit 27e690e163
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/kernel/qlayout.cpp
View File

@ -59,12 +59,10 @@ static int menuBarHeightForWidth(QWidget *menubar, int w)
{ {
if (menubar && !menubar->isHidden() && !menubar->isWindow()) { if (menubar && !menubar->isHidden() && !menubar->isWindow()) {
int result = menubar->heightForWidth(qMax(w, menubar->minimumWidth())); int result = menubar->heightForWidth(qMax(w, menubar->minimumWidth()));
if (result != -1) if (result == -1)
return result; result = menubar->sizeHint().height();
result = menubar->sizeHint() const int min = qSmartMinSize(menubar).height();
.expandedTo(menubar->minimumSize()) result = qBound(min, result, menubar->maximumSize().height());
.expandedTo(menubar->minimumSizeHint())
.boundedTo(menubar->maximumSize()).height();
if (result != -1) if (result != -1)
return result; return result;
} }