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

backends/drm: Fix cursor size check

Browse source 
Currently, the cursor size check ignores the cursor bitmap's size, so
the hardware cursor is used even though the bitmap size exceeds cursor
limits.
This commit is contained in:
Vlad Zahorodnii 2022-05-14 14:04:08 +03:00
parent a601a08ba7
commit 00fb259c41
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/backends/drm/drm_output.cpp
View file

@ -125,10 +125,8 @@ void DrmOutput::updateCursor()
}
return;
}
const QImage cursorImage = cursor->image();
const QMatrix4x4 monitorMatrix = logicalToNativeMatrix(geometry(), scale(), transform());
const QSize surfaceSize = m_gpu->cursorSize() / scale();
const QRect cursorRect = monitorMatrix.mapRect(QRect(cursor->geometry().topLeft(), surfaceSize));
const QRect cursorRect = monitorMatrix.mapRect(cursor->geometry());
if (cursorRect.width() > m_gpu->cursorSize().width() || cursorRect.height() > m_gpu->cursorSize().height()) {
if (layer->isVisible()) {
layer->setVisible(false);
@ -142,10 +140,12 @@ void DrmOutput::updateCursor()
} else {
renderCursorQPainter();
}
layer->setPosition(cursorRect.topLeft());
const QSize surfaceSize = m_gpu->cursorSize() / scale();
const QRect layerRect = monitorMatrix.mapRect(QRect(cursor->geometry().topLeft(), surfaceSize));
layer->setPosition(layerRect.topLeft());
layer->setVisible(cursor->geometry().intersects(geometry()));
if (layer->isVisible()) {
m_setCursorSuccessful = m_pipeline->setCursor(logicalToNativeMatrix(QRect(QPoint(), cursorRect.size()), scale(), transform()).map(cursor->hotspot()));
m_setCursorSuccessful = m_pipeline->setCursor(logicalToNativeMatrix(QRect(QPoint(), layerRect.size()), scale(), transform()).map(cursor->hotspot()));
layer->setVisible(m_setCursorSuccessful);
}
}