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

QWidget: Call appropriate QWindow method from setGeometry_sys()

Browse Source 
When calling resize() from showEvent(), we'd set the full geometry
on the widget's QWindow. This resulted in the top-level window
being moved to the top-left corner, even though no other call to
move() or setGeometry() had happened before.

The solution consists on calling the proper QWindow methods depending
on whether setGeometry_sys() is called for a move, a resize or both.

Furthermore, this needs QWindow::resize() to set its position policy
to frame-exclusive. The documentation states that is already the case
and we're setting the full geometry on the platform window, so we need
to convey that bit of information.

This also solves the age-old conundrum: "### why do we have isMove as
a parameter?"

Change-Id: I2e00fd632929ade14b35ae5e6495ed1ab176d32f
Task-number: QTBUG-56277
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Gabriel de Dietrich 2017-06-12 16:55:03 -07:00
parent 1bbad92e83
commit b65e30c861
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/kernel/qwindow.cpp
View File

@ -1759,6 +1759,7 @@ void QWindow::resize(int w, int h)
void QWindow::resize(const QSize &newSize)
{
Q_D(QWindow);
d->positionPolicy = QWindowPrivate::WindowFrameExclusive;
if (d->platformWindow) {
d->platformWindow->setGeometry(QHighDpi::toNativePixels(QRect(position(), newSize), this));
} else {

14
src/widgets/kernel/qwidget.cpp
View File

@ -7255,7 +7255,8 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
QRect r(x, y, w, h);
bool isResize = olds != r.size();
isMove = oldp != r.topLeft(); //### why do we have isMove as a parameter?
if (!isMove)
isMove = oldp != r.topLeft();
// We only care about stuff that changes the geometry, or may
@ -7289,12 +7290,17 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
if (q->isVisible()) {
if (!q->testAttribute(Qt::WA_DontShowOnScreen) && !q->testAttribute(Qt::WA_OutsideWSRange)) {
if (q->windowHandle()) {
if (QWindow *win = q->windowHandle()) {
if (q->isWindow()) {
q->windowHandle()->setGeometry(q->geometry());
if (isResize && !isMove)
win->resize(w, h);
else if (isMove && !isResize)
win->setPosition(x, y);
else
win->setGeometry(q->geometry());
} else {
QPoint posInNativeParent = q->mapTo(q->nativeParentWidget(),QPoint());
q->windowHandle()->setGeometry(QRect(posInNativeParent,r.size()));
win->setGeometry(QRect(posInNativeParent,r.size()));
}
if (needsShow)

31
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
View File

@ -99,6 +99,8 @@ private slots:
void tst_eventfilter_on_toplevel();
void QTBUG_50561_QCocoaBackingStore_paintDevice_crash();
void QTBUG_56277_resize_on_showEvent();
};
void tst_QWidget_window::initTestCase()
@ -861,5 +863,34 @@ void tst_QWidget_window::QTBUG_50561_QCocoaBackingStore_paintDevice_crash()
w.close();
}
class ResizedOnShowEventWidget : public QWidget
{
public:
void showEvent(QShowEvent *) override
{
const auto *primaryScreen = QApplication::primaryScreen();
auto newSize = primaryScreen->availableGeometry().size() / 4;
if (newSize == geometry().size())
newSize -= QSize(10, 10);
resize(newSize);
}
};
void tst_QWidget_window::QTBUG_56277_resize_on_showEvent()
{
const auto platformName = QGuiApplication::platformName().toLower();
if (platformName != "cocoa" && platformName != "windows")
QSKIP("This can only be consistently tested on desktop platforms with well-known behavior.");
ResizedOnShowEventWidget w;
w.show();
QVERIFY(QTest::qWaitForWindowExposed(&w));
const auto *screen = w.windowHandle()->screen();
const auto geometry = w.geometry();
const int frameHeight = geometry.top() - w.frameGeometry().top();
const int topmostY = screen->availableGeometry().top() + frameHeight;
QVERIFY(geometry.top() > topmostY || geometry.left() > screen->availableGeometry().left());
}
QTEST_MAIN(tst_QWidget_window)
#include "tst_qwidget_window.moc"