1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid virtual calls in constructors.

Browse Source 
QWaylandWindow::setGeometry() is a virtual call and internally it
would call windowType() which is pure virtual, so calling it from
the constructor won't work.

Instead, set geometry explicitly from the constructor and call
setGeometry() on setVisible(true). This also merges it so we send
one expose event (with correct x/y offset) on geometry change + show.

Change-Id: I1d21664c982005c60c8d73740e43b3a463bac4a8
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
This commit is contained in:
Gunnar Sletta 2014-05-22 11:40:08 +02:00 committed by The Qt Project
parent bff6e88d73
commit 75a2fc72aa
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -120,7 +120,7 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
}
setWindowFlags(window->flags());
setGeometry(window->geometry());
setGeometry_helper(window->geometry());
setWindowStateInternal(window->windowState());
handleContentOrientationChange(window->contentOrientation());
}
@ -186,7 +186,7 @@ void QWaylandWindow::setWindowIcon(const QIcon &icon)
mWindowDecoration->update();
}
void QWaylandWindow::setGeometry(const QRect &rect)
void QWaylandWindow::setGeometry_helper(const QRect &rect)
{
QPlatformWindow::setGeometry(QRect(rect.x(), rect.y(),
qBound(window()->minimumWidth(), rect.width(), window()->maximumWidth()),
@ -194,15 +194,25 @@ void QWaylandWindow::setGeometry(const QRect &rect)
if (shellSurface() && window()->transientParent() && window()->type() != Qt::Popup)
shellSurface()->updateTransientParent(window()->transientParent());
}
if (mWindowDecoration && window()->isVisible())
mWindowDecoration->update();
void QWaylandWindow::setGeometry(const QRect &rect)
{
setGeometry_helper(rect);
if (mResizeAfterSwap && windowType() == Egl)
mResizeDirty = true;
else
QWindowSystemInterface::handleGeometryChange(window(), geometry());
QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry()));
if (window()->isVisible()) {
if (mWindowDecoration)
mWindowDecoration->update();
if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize)
mResizeDirty = true;
else
QWindowSystemInterface::handleGeometryChange(window(), geometry());
QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
mSentInitialResize = true;
}
}
void QWaylandWindow::setVisible(bool visible)
@ -217,12 +227,7 @@ void QWaylandWindow::setVisible(bool visible)
mShellSurface->setPopup(transientParent(), mMouseDevice, mMouseSerial);
}
if (!mSentInitialResize) {
QWindowSystemInterface::handleGeometryChange(window(), geometry());
mSentInitialResize = true;
}
QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
setGeometry(window()->geometry());
// Don't flush the events here, or else the newly visible window may start drawing, but since
// there was no frame before it will be stuck at the waitForFrameSync() in
// QWaylandShmBackingStore::beginPaint().

1
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -207,6 +207,7 @@ protected:
private:
bool setWindowStateInternal(Qt::WindowState flags);
void setGeometry_helper(const QRect &rect);
void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice,
ulong timestamp,