Remove Platform::screenGeometries and Platform::screenScales

If you need screen geometries or scales, use AbstractOutput::geometry()
and AbstractOutput::scale(), respectively.
This commit is contained in:
Vlad Zahorodnii 2021-04-29 11:39:05 +03:00
parent cadb13de0e
commit 706eb16b3a
3 changed files with 1 additions and 26 deletions

View file

@ -506,16 +506,6 @@ QSize Platform::screenSize() const
return QSize();
}
QVector<QRect> Platform::screenGeometries() const
{
return QVector<QRect>({QRect(QPoint(0, 0), screenSize())});
}
QVector<qreal> Platform::screenScales() const
{
return QVector<qreal>({1});
}
bool Platform::requiresCompositing() const
{
return true;

View file

@ -152,21 +152,6 @@ public:
* Base implementation returns an invalid size.
*/
virtual QSize screenSize() const;
/**
* Implementing subclasses should provide all geometries in case the backend represents
* a basic screen and uses the BasicScreens.
*
* Base implementation returns one QRect positioned at 0/0 with screenSize() as size.
*/
virtual QVector<QRect> screenGeometries() const;
/**
* Implementing subclasses should provide all geometries in case the backend represents
* a basic screen and uses the BasicScreens.
*
* Base implementation returns a screen with a scale of 1.
*/
virtual QVector<qreal> screenScales() const;
/**
* Implement this method to receive configuration change requests through KWayland's
* OutputManagement interface.

View file

@ -475,7 +475,7 @@ void X11WindowedBackend::createCursor(const QImage &srcImage, const QPoint &hots
const xcb_cursor_t cid = xcb_generate_id(m_connection);
//right now on X we only have one scale between all screens, and we know we will have at least one screen
const qreal outputScale = screenScales().first();
const qreal outputScale = 1;
const QSize targetSize = srcImage.size() * outputScale / srcImage.devicePixelRatio();
const QImage img = srcImage.scaled(targetSize, Qt::KeepAspectRatio);