Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I24b2eade3e8946a654ef6cf3d02ea95255aa1c00
This commit is contained in:
commit
f2e7a1ddd3
@ -1381,7 +1381,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
|
|||||||
tp.area.moveCenter(globalPosition);
|
tp.area.moveCenter(globalPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
tp.state = state;
|
// If the touch point was pressed earlier this frame, we don't want to overwrite its state.
|
||||||
|
if (tp.state != Qt::TouchPointPressed)
|
||||||
|
tp.state = state;
|
||||||
|
|
||||||
tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
|
tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,13 +58,10 @@ DefaultCompositor::DefaultCompositor()
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, [&] (XdgToplevel *toplevel) {
|
QObject::connect(get<XdgWmBase>(), &XdgWmBase::toplevelCreated, get<XdgWmBase>(), [&] (XdgToplevel *toplevel) {
|
||||||
// Needed because lambdas don't support Qt::DirectConnection
|
if (m_config.autoConfigure)
|
||||||
exec([&]{
|
toplevel->sendCompleteConfigure();
|
||||||
if (m_config.autoConfigure)
|
}, Qt::DirectConnection);
|
||||||
toplevel->sendCompleteConfigure();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
Q_ASSERT(isClean());
|
Q_ASSERT(isClean());
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ XdgSurface::XdgSurface(XdgWmBase *xdgWmBase, Surface *surface, wl_client *client
|
|||||||
{
|
{
|
||||||
QVERIFY(!surface->m_pending.buffer);
|
QVERIFY(!surface->m_pending.buffer);
|
||||||
QVERIFY(!surface->m_committed.buffer);
|
QVERIFY(!surface->m_committed.buffer);
|
||||||
connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated);
|
connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated, Qt::DirectConnection);
|
||||||
connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured);
|
connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured);
|
||||||
connect(surface, &Surface::commit, this, [this] {
|
connect(surface, &Surface::commit, this, [this] {
|
||||||
m_committed = m_pending;
|
m_committed = m_pending;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user