Commit ab55c027 authored by David Redondo's avatar David Redondo 🏎
Browse files

Provide extra information about outputs to effects

Adds output manufacturer, model and serial number to EffectScreen.
parent 499474ed
......@@ -1885,6 +1885,21 @@ QString EffectScreenImpl::name() const
return m_platformOutput->name();
}
QString EffectScreenImpl::manufacturer() const
{
return m_platformOutput->manufacturer();
}
QString EffectScreenImpl::model() const
{
return m_platformOutput->model();
}
QString EffectScreenImpl::serialNumber() const
{
return m_platformOutput->serialNumber();
}
qreal EffectScreenImpl::devicePixelRatio() const
{
return m_platformOutput->scale();
......
......@@ -362,6 +362,9 @@ public:
Output *platformOutput() const;
QString name() const override;
QString manufacturer() const override;
QString model() const override;
QString serialNumber() const override;
qreal devicePixelRatio() const override;
QRect geometry() const override;
int refreshRate() const override;
......
......@@ -5,7 +5,7 @@ ecm_setup_version(${PROJECT_VERSION}
VARIABLE_PREFIX KWINEFFECTS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
SOVERSION 13
SOVERSION 14
)
### effects lib ###
......
......@@ -1941,6 +1941,9 @@ class KWINEFFECTS_EXPORT EffectScreen : public QObject
Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged)
Q_PROPERTY(QString name READ name CONSTANT)
Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT)
Q_PROPERTY(QString model READ model CONSTANT)
Q_PROPERTY(QString serialNumber READ serialNumber CONSTANT)
Q_PROPERTY(qreal refreshRate READ refreshRate CONSTANT)
public:
......@@ -1982,6 +1985,10 @@ public:
Q_ENUM(Transform)
virtual Transform transform() const = 0;
virtual QString manufacturer() const = 0;
virtual QString model() const = 0;
virtual QString serialNumber() const = 0;
Q_SIGNALS:
/**
* Notifies that the display will be dimmed in @p time ms.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment