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

Don't depend on shell extension

Browse Source 
The mininimal-cpp compositor example does not have any shell extensions.

Change-Id: I925450a75ab6f93245ca9897bbc6f092d93364b6
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Paul Olav Tvete 2017-04-25 15:19:46 +02:00
parent b0f57f5e31
commit 13a861ede8
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,9 +145,7 @@ void QWaylandWindow::initWindow()
Q_ASSERT(!mShellSurface); Q_ASSERT(!mShellSurface);
mShellSurface = mDisplay->createShellSurface(this); mShellSurface = mDisplay->createShellSurface(this);
if (!mShellSurface) if (mShellSurface) {
qFatal("Could not create a shell surface object.");
mShellSurface->setType(window()->type(), transientParent()); mShellSurface->setType(window()->type(), transientParent());
// Set initial surface title // Set initial surface title
@ -186,6 +184,9 @@ void QWaylandWindow::initWindow()
// the user may have already set some window properties, so make sure to send them out // the user may have already set some window properties, so make sure to send them out
for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it) for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it)
mShellSurface->sendProperty(it.key(), it.value()); mShellSurface->sendProperty(it.key(), it.value());
} else {
qWarning("Could not create a shell surface object.");
}
} }
// Enable high-dpi rendering. Scale() returns the screen scale factor and will // Enable high-dpi rendering. Scale() returns the screen scale factor and will
@ -327,7 +328,7 @@ void QWaylandWindow::setGeometry(const QRect &rect)
void QWaylandWindow::sendExposeEvent(const QRect &rect) void QWaylandWindow::sendExposeEvent(const QRect &rect)
{ {
if (mShellSurface && !mShellSurface->handleExpose(rect)) if (!(mShellSurface && mShellSurface->handleExpose(rect)))
QWindowSystemInterface::handleExposeEvent(window(), rect); QWindowSystemInterface::handleExposeEvent(window(), rect);
} }