yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace some manual floored QPointF->QPoint conversion with flooredPoint calls

Browse source
This commit is contained in:
Arjen Hiemstra 2022-10-24 16:14:05 +02:00
parent 88bc25b376
commit b637785f49
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input.cpp
View file

@ -3453,7 +3453,7 @@ void InputDeviceHandler::updateDecoration()
Decoration::DecoratedClientImpl *decoration = nullptr;
auto hover = m_hover.window.data();
if (hover && hover->decoratedClient()) {
if (!hover->clientGeometry().toRect().contains(QPoint(std::floor(position().x()), std::floor(position().y())))) {
if (!hover->clientGeometry().toRect().contains(flooredPoint(position()))) {
// input device above decoration
decoration = hover->decoratedClient();
}

13
src/pointer_input.cpp
View file

@ -54,8 +54,7 @@ static bool screenContainsPos(const QPointF &pos)
{
const auto outputs = workspace()->outputs();
for (const Output *output : outputs) {
if (output->geometry().contains(QPoint(std::floor(pos.x()),
std::floor(pos.y())))) {
if (output->geometry().contains(flooredPoint(pos))) {
return true;
}
}
@ -735,23 +734,19 @@ QPointF PointerInputRedirection::applyPointerConfinement(const QPointF &pos) con
return pos;
}
auto floorPoint = [](const QPointF &point) {
return QPoint(std::floor(point.x()), std::floor(point.y()));
};
const QRegion confinementRegion = getConstraintRegion(focus(), cf);
if (confinementRegion.contains(floorPoint(pos))) {
if (confinementRegion.contains(flooredPoint(pos))) {
return pos;
}
QPointF p = pos;
// allow either x or y to pass
p = QPointF(m_pos.x(), pos.y());
if (confinementRegion.contains(floorPoint(p))) {
if (confinementRegion.contains(flooredPoint(p))) {
return p;
}
p = QPointF(pos.x(), m_pos.y());
if (confinementRegion.contains(floorPoint(p))) {
if (confinementRegion.contains(flooredPoint(p))) {
return p;
}