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

QMainWindow: Observe left contents margin when positioning status bar.

Browse Source 
Task-number: QTBUG-38152
Change-Id: I4c762a113dbfe47472d1087aa34c0e327083ee16
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2014-11-18 17:02:49 +01:00
parent 2409ed7d48
commit 4958cadeda
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -1440,7 +1440,7 @@ void QMainWindowLayout::setGeometry(const QRect &_r)
QLayout::setGeometry(r);
if (statusbar) {
QRect sbr(QPoint(0, 0),
QRect sbr(QPoint(r.left(), 0),
QSize(r.width(), statusbar->heightForWidth(r.width()))
.expandedTo(statusbar->minimumSize()));
sbr.moveBottom(r.bottom());

33
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
View File

@ -46,6 +46,7 @@
#include <qlabel.h>
#include <qtextedit.h>
#include <qstylehints.h>
#include <qdesktopwidget.h>
#include <private/qmainwindowlayout_p.h>
#include <private/qdockarealayout_p.h>
@ -132,6 +133,8 @@ private slots:
void saveRestore_data();
void statusBar();
#endif
void contentsMargins_data();
void contentsMargins();
void isSeparator();
#ifndef QTEST_NO_CURSOR
void setCursor();
@ -749,8 +752,38 @@ void tst_QMainWindow::statusBar()
QVERIFY(indexOfSb == -1);
}
}
#endif
void tst_QMainWindow::contentsMargins_data()
{
QTest::addColumn<int>("contentsMargin");
QTest::newRow("0") << 0;
QTest::newRow("10") << 10;
}
void tst_QMainWindow::contentsMargins()
{
QFETCH(int, contentsMargin);
QMainWindow mw;
const QRect availGeometry = QApplication::desktop()->availableGeometry();
mw.menuBar()->addMenu("File");
mw.setWindowTitle(QLatin1String(QTest::currentTestFunction())
+ QLatin1Char(' ') + QLatin1String(QTest::currentDataTag()));
mw.resize(availGeometry.size() / 4);
mw.move((availGeometry.width() - mw.width()) / 2,
(availGeometry.height() - mw.height()) / 2);
mw.setContentsMargins(contentsMargin, contentsMargin, contentsMargin, contentsMargin);
mw.statusBar()->showMessage("Hello");
mw.show();
QVERIFY(QTest::qWaitForWindowExposed(&mw));
QCOMPARE(mw.statusBar()->geometry().left(), contentsMargin);
QCOMPARE(mw.statusBar()->geometry().bottom() + 1, mw.height() - contentsMargin);
}
void tst_QMainWindow::centralWidget()
{
{